From 7afc61691ba2febab8d1c5966fe9c480f342b51d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Jun 2015 15:27:49 +0200 Subject: [PATCH] Doh --- src/hydra-queue-runner/hydra-queue-runner.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc index a9de0560..ce725592 100644 --- a/src/hydra-queue-runner/hydra-queue-runner.cc +++ b/src/hydra-queue-runner/hydra-queue-runner.cc @@ -1249,7 +1249,8 @@ bool State::doBuildStep(std::shared_ptr store, Step::ptr step, the build to fail). */ for (auto & build2 : indirect) { if ((cachedFailure && build2->drvPath == step->drvPath) || - (!cachedFailure && build == build2)) + (!cachedFailure && build == build2) || + build2->finishedInDB) continue; createBuildStep(txn, 0, build2, step, machine->sshName, buildStepStatus, result.errorMsg, build->id); @@ -1261,8 +1262,8 @@ bool State::doBuildStep(std::shared_ptr store, Step::ptr step, /* Mark all builds that depend on this derivation as failed. */ for (auto & build2 : indirect) { + if (build2->finishedInDB) continue; printMsg(lvlError, format("marking build %1% as failed") % build2->id); - if (build->finishedInDB) continue; txn.parameterized ("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5 where id = $1 and finished = 0") (build2->id)