guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

281/376: nix-store --gc: Don't warn about missing manifests directory


From: Ludovic Courtès
Subject: 281/376: nix-store --gc: Don't warn about missing manifests directory
Date: Wed, 28 Jan 2015 22:05:37 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit 06a86aee15930205f294859bf1e3ac9104029a29
Author: Eelco Dolstra <address@hidden>
Date:   Tue Nov 4 10:41:29 2014 +0100

    nix-store --gc: Don't warn about missing manifests directory
---
 src/libstore/gc.cc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index e9db711..ebee485 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -355,7 +355,8 @@ Roots LocalStore::findRoots()
 
     /* Process direct roots in {gcroots,manifests,profiles}. */
     nix::findRoots(*this, settings.nixStateDir + "/" + gcRootsDir, DT_UNKNOWN, 
roots);
-    nix::findRoots(*this, settings.nixStateDir + "/manifests", DT_UNKNOWN, 
roots);
+    if (pathExists(settings.nixStateDir + "/manifests"))
+        nix::findRoots(*this, settings.nixStateDir + "/manifests", DT_UNKNOWN, 
roots);
     nix::findRoots(*this, settings.nixStateDir + "/profiles", DT_UNKNOWN, 
roots);
 
     return roots;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]