lix-project/hydra
3
0
Fork 6
Code Issues Pull requests Packages Projects Releases Wiki Activity

Sync with latest Nix

Browse source
This commit is contained in:
Eelco Dolstra 2017-07-17 11:38:58 +02:00
parent 064fd20b6f
commit 66ae66024e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -224,7 +224,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, false, true);
copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs, NoRepair, NoCheckSigs);
/* Copy the input closure. */
if (/* machine->sshName != "localhost" */ true) {
@ -416,7 +416,7 @@ void State::buildRemote(ref<Store> destStore,
to << cmdExportPaths << 0 << outputs;
to.flush();
destStore->importPaths(from, result.accessor, true);
destStore->importPaths(from, result.accessor, NoCheckSigs);
/* Release the tokens pertaining to NAR
compression. After this we only have the uncompressed

4
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -435,8 +435,8 @@ void State::markSucceededBuild(pqxx::work & txn, Build::ptr build,
(product.type)
(product.subtype)
(product.fileSize, product.isRegular)
(printHash(product.sha1hash), product.isRegular)
(printHash(product.sha256hash), product.isRegular)
(product.sha1hash.to_string(Base16, false), product.isRegular)
(product.sha256hash.to_string(Base16, false), product.isRegular)
(product.path)
(product.name)
(product.defaultPath).exec();

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

@ -629,9 +629,9 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
product.fileSize = row[2].as<off_t>();
}
if (!row[3].is_null())
product.sha1hash = parseHash(htSHA1, row[3].as<std::string>());
product.sha1hash = Hash(row[3].as<std::string>(), htSHA1);
if (!row[4].is_null())
product.sha256hash = parseHash(htSHA256, row[4].as<std::string>());
product.sha256hash = Hash(row[4].as<std::string>(), htSHA256);
if (!row[5].is_null())
product.path = row[5].as<std::string>();
product.name = row[6].as<std::string>();