[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;
- 267/376: Remove comments claiming we use a private PID namespace, (continued)
- 267/376: Remove comments claiming we use a private PID namespace, Ludovic Courtès, 2015/01/28
- 237/376: Don't recompile the same regex over and over, Ludovic Courtès, 2015/01/28
- 297/376: Build Ubuntu 14.10 package, Ludovic Courtès, 2015/01/28
- 268/376: Document some primops, Ludovic Courtès, 2015/01/28
- 272/376: Shut up a clang warning, Ludovic Courtès, 2015/01/28
- 257/376: Revert "binary download: Use $NIX_CURL_FLAGS", Ludovic Courtès, 2015/01/28
- 266/376: doc: fixed nix-instantiate --find-file, Ludovic Courtès, 2015/01/28
- 282/376: download-from-binary-cache.pl: Fix flushing of stderr, Ludovic Courtès, 2015/01/28
- 256/376: Merge pull request #372 from wmertens/patch-4, Ludovic Courtès, 2015/01/28
- 280/376: Typo, Ludovic Courtès, 2015/01/28
- 281/376: nix-store --gc: Don't warn about missing manifests directory,
Ludovic Courtès <=
- 161/376: Restructuring the Nix manual, Ludovic Courtès, 2015/01/28
- 271/376: Revert "Revert "Temporarily disable darwin builds while hydra's darwin is borked"", Ludovic Courtès, 2015/01/28
- 299/376: Remove Hydra scheduling priorities, Ludovic Courtès, 2015/01/28
- 285/376: Make ~DerivationGoal more reliable, Ludovic Courtès, 2015/01/28
- 277/376: nix-daemon: Get peer credentials on Mac OS X, Ludovic Courtès, 2015/01/28
- 286/376: build-remote.pl.in: Add some more trace messages, Ludovic Courtès, 2015/01/28
- 288/376: Add functors (callable attribute sets)., Ludovic Courtès, 2015/01/28
- 236/376: nix-env: Add regular expression support in selectors, Ludovic Courtès, 2015/01/28
- 261/376: Improve printing of ASTs, Ludovic Courtès, 2015/01/28
- 269/376: Update release notes, Ludovic Courtès, 2015/01/28