[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
109/118: nix-store --gc: Don't warn about missing manifests directory
From: |
Ludovic Courtès |
Subject: |
109/118: nix-store --gc: Don't warn about missing manifests directory |
Date: |
Tue, 19 May 2015 14:46:03 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 86b9e6d4575e5c93f428b8563ae259f0f4014173
Author: Eelco Dolstra <address@hidden>
Date: Tue Nov 4 10:41:29 2014 +0100
nix-store --gc: Don't warn about missing manifests directory
---
nix/libstore/gc.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
index 05d332f..2a53b54 100644
--- a/nix/libstore/gc.cc
+++ b/nix/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;
- 100/118: Settings: Add bool get(), (continued)
- 100/118: Settings: Add bool get(), Ludovic Courtès, 2015/05/19
- 106/118: Improved error message when encountering unsupported file types, Ludovic Courtès, 2015/05/19
- 114/118: nix-daemon: Call exit(), not _exit(), Ludovic Courtès, 2015/05/19
- 99/118: Add an 'optimiseStore' remote procedure call., Ludovic Courtès, 2015/05/19
- 107/118: Fix build on gcc < 4.7, Ludovic Courtès, 2015/05/19
- 98/118: Add disallowedReferences / disallowedRequisites, Ludovic Courtès, 2015/05/19
- 110/118: Make ~DerivationGoal more reliable, Ludovic Courtès, 2015/05/19
- 111/118: Don't use ADDR_LIMIT_3GB, Ludovic Courtès, 2015/05/19
- 115/118: Disable vacuuming the DB after garbage collection, Ludovic Courtès, 2015/05/19
- 117/118: Build derivations in a more predictable order, Ludovic Courtès, 2015/05/19
- 109/118: nix-store --gc: Don't warn about missing manifests directory,
Ludovic Courtès <=
- 118/118: Don't wait for PID -1, Ludovic Courtès, 2015/05/19
- 112/118: Fix message, Ludovic Courtès, 2015/05/19
- 116/118: Don't create unnecessary substitution goals for derivations, Ludovic Courtès, 2015/05/19