the-distro/hydra
1
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Revert "Revert "Use copyClosure instead of computeFSClosure + copyPaths""

Browse source 
This reverts commit 8e3ada2afc.
This commit is contained in:
Graham Christensen 2022-03-29 15:28:47 -04:00
parent 78ef4ae9a5
commit 3b048ed136
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hydra-queue-runner/build-remote.cc
View file

@ -287,9 +287,9 @@ void State::buildRemote(ref<Store> destStore,
this will copy the inputs to the binary cache from the local this will copy the inputs to the binary cache from the local
store. */ store. */
if (localStore != std::shared_ptr<Store>(destStore)) { if (localStore != std::shared_ptr<Store>(destStore)) {
StorePathSet closure; copyClosure(*localStore, *destStore,
localStore->computeFSClosure(step->drv->inputSrcs, closure); step->drv->inputSrcs,
copyPaths(*localStore, *destStore, closure, NoRepair, NoCheckSigs, NoSubstitute); NoRepair, NoCheckSigs, NoSubstitute);
} }
{ {

6
src/hydra-queue-runner/queue-monitor.cc
View file

@ -513,9 +513,9 @@ Step::ptr State::createStep(ref<Store> destStore,
// FIXME: should copy directly from substituter to destStore. // FIXME: should copy directly from substituter to destStore.
} }
StorePathSet closure; copyClosure(*localStore, *destStore,
localStore->computeFSClosure({*path}, closure); StorePathSet { *path },
copyPaths(*localStore, *destStore, closure, NoRepair, CheckSigs, NoSubstitute); NoRepair, CheckSigs, NoSubstitute);
time_t stopTime = time(0); time_t stopTime = time(0);