Delete a left-over trash directory before doing a GC

NixOS · Jan 4, 2013 · e42df68 · e42df68
1 parent 92926be
commit e42df68
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
@@ -659,7 +659,10 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
        increase, since we hold locks on everything.  So everything
        that is not reachable from `roots'. */
 
-    if (state.shouldDelete) createDirs(state.trashDir);
+    if (state.shouldDelete) {
+        if (pathExists(state.trashDir)) deleteGarbage(state, state.trashDir);
+        createDirs(state.trashDir);
+    }
 
     /* Now either delete all garbage paths, or just the specified
        paths (for gcDeleteSpecific). */