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

Bump Nix

Browse Source 
Fixes #398.
This commit is contained in:
Eelco Dolstra
2016-11-09 19:15:13 +01:00
parent e2a012de8c
commit cb5e438a08
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hydra-queue-runner/build-remote.cc
View File

@ -220,7 +220,7 @@ void State::buildRemote(ref<Store> destStore,
a no-op for regular stores, but for the binary cache store,
this will copy the inputs to the binary cache from the local
store. */
copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs);
copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs, false, true);
/* Copy the input closure. */
if (/* machine->sshName != "localhost" */ true) {
@ -388,7 +388,7 @@ void State::buildRemote(ref<Store> destStore,
to << cmdExportPaths << 0 << outputs;
to.flush();
destStore->importPaths(from, result.accessor);
destStore->importPaths(from, result.accessor, true);
auto now2 = std::chrono::steady_clock::now();

8
src/hydra-queue-runner/hydra-queue-runner.cc
View File

@ -799,11 +799,9 @@ void State::run(BuildID buildOne)
localStore = openStore();
if (hydraConfig["store_uri"] == "") {
_destStore = localStore;
} else {
_destStore = openStoreAt(hydraConfig["store_uri"]);
}
_destStore = hydraConfig["store_uri"] == ""
? localStore
: openStore(hydraConfig["store_uri"]);
auto isTrue = [](const std::string & s) {
return s == "1" || s == "true";