about summary refs log tree commit diff
path: root/src/libstore/gc.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-01T23·14-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-01T23·14-0400
commit967d066d8e452e59507ebae7585d6f34a4edf687 (patch)
tree15607d4c9389a274dda1ce659a41e10b06c98f12 /src/libstore/gc.cc
parent1df702d34733e69599a6ae21cb366348a2534b7d (diff)
nix-store --gc: Make ‘--max-freed 0’ do the right thing
That is, delete almost nothing (it will still remove unused links from
/nix/store/.links).
Diffstat (limited to 'src/libstore/gc.cc')
-rw-r--r--src/libstore/gc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index a7547d079b31..7753b3fe20c0 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -550,7 +550,7 @@ bool LocalStore::tryToDelete(GCState & state, const Path & path)
         } else
             deleteGarbage(state, path);
 
-        if (state.options.maxFreed && state.results.bytesFreed + state.bytesInvalidated > state.options.maxFreed) {
+        if (state.results.bytesFreed + state.bytesInvalidated > state.options.maxFreed) {
             printMsg(lvlInfo, format("deleted or invalidated more than %1% bytes; stopping") % state.options.maxFreed);
             throw GCLimitReached();
         }
@@ -675,7 +675,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
                 throw Error(format("cannot delete path `%1%' since it is still alive") % *i);
         }
         
-    } else {
+    } else if (options.maxFreed > 0) {
         
         if (shouldDelete(state.options.action))
             printMsg(lvlError, format("deleting garbage..."));