280.11280.11

2 files changed, 8 insertions, 2 deletions

diff --git a/command-list.c b/command-list.c
index 514d86e..5964f61 100644
--- a/command-list.c
+++ b/command-list.c
@@ -832,7 +832,13 @@ static void find_conflicting_files(Options *op,
 
         case FTS_DP:
         case FTS_D:
-            if (op->no_recursion)
+            if (op->no_recursion ||
+                /*
+                 * stop recursing into any "nvidia-cg-toolkit"
+                 * directory to prevent libGL.so.1 from being deleted
+                 * (see bug 843595).
+                 */
+                !strcmp("nvidia-cg-toolkit", ent->fts_name))
                 fts_set(fts, ent, FTS_SKIP);
             break;
 
diff --git a/version.mk b/version.mk
index 1ec3833..e0b57d5 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 280.04
+NVIDIA_VERSION = 280.11