diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-01T09·39+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-01T09·39+0100 |
| commit | 855699855fd271e0b8e43001bf1793ca3ef9b71c (patch) | |
| tree | 64bf1198f8e409a1851162aacc5eb893c344e924 | |
| parent | c129fc6ee8a8bf6de633dc1b91869a0c428ca75c (diff) | |
Remove obsolete references to manifests
Closes #323.
| -rw-r--r-- | src/libstore/gc.cc | 4 | ||||
| -rw-r--r-- | tests/common.sh.in | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index ab2c5ca0274c..943b16c28fa3 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -324,10 +324,8 @@ Roots LocalStore::findRootsNoTemp() { Roots roots; - /* Process direct roots in {gcroots,manifests,profiles}. */ + /* Process direct roots in {gcroots,profiles}. */ findRoots(stateDir + "/" + gcRootsDir, DT_UNKNOWN, roots); - if (pathExists(stateDir + "/manifests")) - findRoots(stateDir + "/manifests", DT_UNKNOWN, roots); findRoots(stateDir + "/profiles", DT_UNKNOWN, roots); /* Add additional roots returned by the program specified by the diff --git a/tests/common.sh.in b/tests/common.sh.in index 186f9d6b9553..195205988afb 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -11,7 +11,6 @@ export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_CONF_DIR=$TEST_ROOT/etc -export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests export _NIX_TEST_SHARED=$TEST_ROOT/shared if [[ -n $NIX_STORE ]]; then export _NIX_TEST_NO_SANDBOX=1 |