lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix some more references to storeDir

Browse source
This commit is contained in:
Eelco Dolstra 2016-06-03 13:37:52 +02:00
parent a8dfdc52b8
commit 30c8c3ba2d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/local-store.cc
View file

@ -547,7 +547,7 @@ uint64_t LocalStore::addValidPath(State & state,
efficiently query whether a path is an output of some efficiently query whether a path is an output of some
derivation. */ derivation. */
if (isDerivation(info.path)) { if (isDerivation(info.path)) {
Derivation drv = readDerivation(info.path); Derivation drv = readDerivation(realStoreDir + "/" + baseNameOf(info.path));
/* Verify that the output paths in the derivation are correct /* Verify that the output paths in the derivation are correct
(i.e., follow the scheme for computing output paths from (i.e., follow the scheme for computing output paths from
@ -869,7 +869,7 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos)
if (isDerivation(i.path)) { if (isDerivation(i.path)) {
// FIXME: inefficient; we already loaded the // FIXME: inefficient; we already loaded the
// derivation in addValidPath(). // derivation in addValidPath().
Derivation drv = readDerivation(i.path); Derivation drv = readDerivation(realStoreDir + "/" + baseNameOf(i.path));
checkDerivationOutputs(i.path, drv); checkDerivationOutputs(i.path, drv);
} }