delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

copyClosureTo: Use SubstituteFlag instead of bool

Browse source 
This matches Nix (in the same serialization logic in
`src/libstore/legacy-ssh-store.cc`) and adds clarity.
This commit is contained in:
John Ericson 2022-02-20 20:06:22 +00:00
parent a5d44b60ea
commit 86cd5e9076
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/hydra-queue-runner/build-remote.cc
View file

@ -113,7 +113,7 @@ static void copyClosureTo(
Machine::Connection & conn, Machine::Connection & conn,
Store & destStore, Store & destStore,
const StorePathSet & paths, const StorePathSet & paths,
bool useSubstitutes = false) SubstituteFlag useSubstitutes = NoSubstitute)
{ {
StorePathSet closure; StorePathSet closure;
destStore.computeFSClosure(paths, closure); destStore.computeFSClosure(paths, closure);
@ -266,7 +266,7 @@ static BasicDerivation sendInputs(
destStore.computeFSClosure(basicDrv.inputSrcs, closure); destStore.computeFSClosure(basicDrv.inputSrcs, closure);
copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute); copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} else { } else {
copyClosureTo(conn, destStore, basicDrv.inputSrcs, true); copyClosureTo(conn, destStore, basicDrv.inputSrcs, Substitute);
} }
auto now2 = std::chrono::steady_clock::now(); auto now2 = std::chrono::steady_clock::now();