diff options
| -rw-r--r-- | command-list.c | 8 | ||||
| -rw-r--r-- | version.mk | 2 |
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; @@ -1 +1 @@ -NVIDIA_VERSION = 280.04 +NVIDIA_VERSION = 280.11 |