From 86cd5e907683a8c4b0f6cd75d4879648d8313b98 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 20 Feb 2022 20:06:22 +0000 Subject: [PATCH] `copyClosureTo`: Use `SubstituteFlag` instead of `bool` This matches Nix (in the same serialization logic in `src/libstore/legacy-ssh-store.cc`) and adds clarity. --- src/hydra-queue-runner/build-remote.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index 73f46a53..f41585c8 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -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); @@ -266,7 +266,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();