Get rid of "will retry" messages after "maybe cancelling..."

2016-03-08 13:09:39 +01:00
parent 718fef29ef
commit b77a43b83d
2 changed files with 11 additions and 10 deletions
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@ -425,8 +425,9 @@ private:

    /* Perform the given build step. Return true if the step is to be
       retried. */
-    bool doBuildStep(nix::ref<nix::Store> destStore, Step::ptr step,
-        Machine::ptr machine);
+    enum StepResult { sDone, sRetry, sMaybeCancelled };
+    StepResult doBuildStep(nix::ref<nix::Store> destStore,
+        Step::ptr step, Machine::ptr machine);

    void buildRemote(nix::ref<nix::Store> destStore,
        Machine::ptr machine, Step::ptr step,