diff options
author | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
commit | 2721e9f56f92f5bd630dcbb0104fc56159cb28d4 (patch) | |
tree | f46ac1a8807b81cc54d176e8fb72915aa057f0ac /src/libstore/local-store.cc | |
parent | bffe35acedafcd7c7237cb1415798362bff8a180 (diff) | |
parent | a6a3f3a8c26fdd6900880c13e924e6879d6c714c (diff) |
Merge from trunk
Diffstat (limited to 'src/libstore/local-store.cc')
-rw-r--r-- | src/libstore/local-store.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 6ad4c84c69ff..702ff67e793e 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -510,7 +510,7 @@ void LocalStore::checkDerivationOutputs(const Path & drvPath, const Derivation & } -unsigned long long LocalStore::addValidPath(const ValidPathInfo & info) +unsigned long long LocalStore::addValidPath(const ValidPathInfo & info, bool checkOutputs) { SQLiteStmtUse use(stmtRegisterValidPath); stmtRegisterValidPath.bind(info.path); @@ -540,7 +540,7 @@ unsigned long long LocalStore::addValidPath(const ValidPathInfo & info) derivations). Note that if this throws an error, then the DB transaction is rolled back, so the path validity registration above is undone. */ - checkDerivationOutputs(info.path, drv); + if (checkOutputs) checkDerivationOutputs(info.path, drv); foreach (DerivationOutputs::iterator, i, drv.outputs) { SQLiteStmtUse use(stmtAddDerivationOutput); @@ -1521,7 +1521,7 @@ void LocalStore::upgradeStore6() SQLiteTxn txn(db); foreach (PathSet::iterator, i, validPaths) { - addValidPath(queryPathInfoOld(*i)); + addValidPath(queryPathInfoOld(*i), false); std::cerr << "."; } |