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

Fix repair during substitution

Browse source
This commit is contained in:
Eelco Dolstra 2016-05-12 15:42:19 +02:00
parent 3be2e71ab3
commit b66ab6cdbc
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/build.cc
View file

@ -3198,7 +3198,8 @@ void SubstitutionGoal::tryToRun()
/* Wake up the worker loop when we're done. */ /* Wake up the worker loop when we're done. */
Finally updateStats([this]() { outPipe.writeSide.close(); }); Finally updateStats([this]() { outPipe.writeSide.close(); });
copyStorePath(ref<Store>(sub), ref<Store>(worker.store.shared_from_this()), storePath); copyStorePath(ref<Store>(sub), ref<Store>(worker.store.shared_from_this()),
storePath, repair);
promise.set_value(); promise.set_value();
} catch (...) { } catch (...) {

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

@ -358,14 +358,14 @@ const Store::Stats & Store::getStats()
void copyStorePath(ref<Store> srcStore, ref<Store> dstStore, void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
const Path & storePath) const Path & storePath, bool repair)
{ {
auto info = srcStore->queryPathInfo(storePath); auto info = srcStore->queryPathInfo(storePath);
StringSink sink; StringSink sink;
srcStore->narFromPath({storePath}, sink); srcStore->narFromPath({storePath}, sink);
dstStore->addToStore(*info, *sink.s); dstStore->addToStore(*info, *sink.s, repair);
} }

2
src/libstore/store-api.hh
View file

@ -503,7 +503,7 @@ Path computeStorePathForText(const string & name, const string & s,
/* Copy a path from one store to another. */ /* Copy a path from one store to another. */
void copyStorePath(ref<Store> srcStore, ref<Store> dstStore, void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
const Path & storePath); const Path & storePath, bool repair = false);
/* Remove the temporary roots file for this process. Any temporary /* Remove the temporary roots file for this process. Any temporary