forked from lix-project/nix-eval-jobs
Cleanup gcroots creation.
This commit is contained in:
parent
8dd6426d15
commit
7aa9835adb
|
@ -264,8 +264,6 @@ static void worker(
|
||||||
if (auto drvInfo = getDerivation(state, *v, false)) {
|
if (auto drvInfo = getDerivation(state, *v, false)) {
|
||||||
|
|
||||||
auto drv = Drv(state, *drvInfo);
|
auto drv = Drv(state, *drvInfo);
|
||||||
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>();
|
|
||||||
auto storePath = localStore->parseStorePath(drv.drvPath);
|
|
||||||
|
|
||||||
reply = drv;
|
reply = drv;
|
||||||
reply["attr"] = attrPath;
|
reply["attr"] = attrPath;
|
||||||
|
@ -275,8 +273,11 @@ static void worker(
|
||||||
done. */
|
done. */
|
||||||
if (myArgs.gcRootsDir != "") {
|
if (myArgs.gcRootsDir != "") {
|
||||||
Path root = myArgs.gcRootsDir + "/" + std::string(baseNameOf(drv.drvPath));
|
Path root = myArgs.gcRootsDir + "/" + std::string(baseNameOf(drv.drvPath));
|
||||||
if (!pathExists(root))
|
if (!pathExists(root)) {
|
||||||
|
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>();
|
||||||
|
auto storePath = localStore->parseStorePath(drv.drvPath);
|
||||||
localStore->addPermRoot(storePath, root);
|
localStore->addPermRoot(storePath, root);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue