ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ca-derivations-prep

Browse Source
This commit is contained in:
John Ericson
2023-12-07 15:01:35 -05:00
parent 11f8030b0f 91bbd5366f
commit 31ea6458ca
2 changed files with 5 additions and 5 deletions
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,
Store & destStore,
const StorePathSet & paths,
bool useSubstitutes = false)
SubstituteFlag useSubstitutes = NoSubstitute)
{
StorePathSet closure;
destStore.computeFSClosure(paths, closure);
@ -290,7 +290,7 @@ static BasicDerivation sendInputs(
destStore.computeFSClosure(basicDrv.inputSrcs, closure);
copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} else {
copyClosureTo(conn, destStore, basicDrv.inputSrcs, true);
copyClosureTo(conn, destStore, basicDrv.inputSrcs, Substitute);
}
auto now2 = std::chrono::steady_clock::now();