delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Doh

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-19 15:27:49 +02:00
parent 133d298e26
commit 7afc61691b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1249,7 +1249,8 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
the build to fail). */ the build to fail). */
for (auto & build2 : indirect) { for (auto & build2 : indirect) {
if ((cachedFailure && build2->drvPath == step->drvPath) || if ((cachedFailure && build2->drvPath == step->drvPath) ||
(!cachedFailure && build == build2)) (!cachedFailure && build == build2) ||
build2->finishedInDB)
continue; continue;
createBuildStep(txn, 0, build2, step, machine->sshName, createBuildStep(txn, 0, build2, step, machine->sshName,
buildStepStatus, result.errorMsg, build->id); buildStepStatus, result.errorMsg, build->id);
@ -1261,8 +1262,8 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
/* Mark all builds that depend on this derivation as failed. */ /* Mark all builds that depend on this derivation as failed. */
for (auto & build2 : indirect) { for (auto & build2 : indirect) {
if (build2->finishedInDB) continue;
printMsg(lvlError, format("marking build %1% as failed") % build2->id); printMsg(lvlError, format("marking build %1% as failed") % build2->id);
if (build->finishedInDB) continue;
txn.parameterized txn.parameterized
("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5 where id = $1 and finished = 0") ("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5 where id = $1 and finished = 0")
(build2->id) (build2->id)