Skip to content
Snippets Groups Projects
Unverified Commit 85569985 authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Remove obsolete references to manifests 

Closes #323.
parent c129fc6e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/libstore/gc.cc
+ 1
− 3
View file @ 85569985
...@@ -324,10 +324,8 @@ Roots LocalStore::findRootsNoTemp() ...@@ -324,10 +324,8 @@ Roots LocalStore::findRootsNoTemp()
{ {
Roots roots; Roots roots;
/* Process direct roots in {gcroots,manifests,profiles}. */ /* Process direct roots in {gcroots,profiles}. */
findRoots(stateDir + "/" + gcRootsDir, DT_UNKNOWN, roots); findRoots(stateDir + "/" + gcRootsDir, DT_UNKNOWN, roots);
if (pathExists(stateDir + "/manifests"))
findRoots(stateDir + "/manifests", DT_UNKNOWN, roots);
findRoots(stateDir + "/profiles", DT_UNKNOWN, roots); findRoots(stateDir + "/profiles", DT_UNKNOWN, roots);
/* Add additional roots returned by the program specified by the /* Add additional roots returned by the program specified by the
......
tests/common.sh.in
+ 0
− 1
View file @ 85569985
...@@ -11,7 +11,6 @@ export NIX_LOCALSTATE_DIR=$TEST_ROOT/var ...@@ -11,7 +11,6 @@ export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_CONF_DIR=$TEST_ROOT/etc
export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
export _NIX_TEST_SHARED=$TEST_ROOT/shared export _NIX_TEST_SHARED=$TEST_ROOT/shared
if [[ -n $NIX_STORE ]]; then if [[ -n $NIX_STORE ]]; then
export _NIX_TEST_NO_SANDBOX=1 export _NIX_TEST_NO_SANDBOX=1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment