diff options
| -rw-r--r-- | src/libstore/local-store.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 4ac7d7f4e6f7..4c86538837a8 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1274,7 +1274,7 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos) if (isValidPath_(i->path)) updatePathInfo(*i); else - addValidPath(*i); + addValidPath(*i, false); paths.insert(i->path); } @@ -1284,6 +1284,17 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos) addReference(referrer, queryValidPathId(*j)); } + /* Check that the derivation outputs are correct. We can't do + this in addValidPath() above, because the references might + not be valid yet. */ + foreach (ValidPathInfos::const_iterator, i, infos) + if (isDerivation(i->path)) { + // FIXME: inefficient; we already loaded the + // derivation in addValidPath(). + Derivation drv = parseDerivation(readFile(i->path)); + checkDerivationOutputs(i->path, drv); + } + /* Do a topological sort of the paths. This will throw an error if a cycle is detected and roll back the transaction. Cycles can only occur when a derivation |