vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge pull request #1125 from obsidiansystems/simplify--copyClosure

Browse source 
Use `copyClosure` instead of `computeFSClosure` + `copyPaths`
This commit is contained in:
Eelco Dolstra 2022-03-23 12:49:22 +01:00 committed by GitHub
parent 01fb23ddf6 f14c583ce5
commit 3390415905
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);