diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-08-30 19:01:30 +0200 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-08-30 19:01:30 +0200 |
| commit | a385c5935aa7cfec4de47cfe5620bca2e0e0e55d (patch) | |
| tree | 71606271d2fe3c234a8e4180c6c2bba16964a741 /src/libstore/build | |
| parent | dc0cace604d71d274654525e90d0afed9aa36dc9 (diff) | |
libstore: rename Goal::Finished::result to exitCode
the more useful type for `result` is BuildResult.
Change-Id: If93d9384e8d686eb63b33320f1d565f9b9afbf3a
Diffstat (limited to 'src/libstore/build')
| -rw-r--r-- | src/libstore/build/derivation-goal.cc | 2 | ||||
| -rw-r--r-- | src/libstore/build/goal.hh | 2 | ||||
| -rw-r--r-- | src/libstore/build/worker.cc | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index c288003b4..3011d5c6f 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -1549,7 +1549,7 @@ Goal::Finished DerivationGoal::done( } return Finished{ - .result = buildResult.success() ? ecSuccess : ecFailed, + .exitCode = buildResult.success() ? ecSuccess : ecFailed, .ex = ex ? std::make_shared<Error>(std::move(*ex)) : nullptr, .permanentFailure = buildResult.status == BuildResult::PermanentFailure, .timedOut = buildResult.status == BuildResult::TimedOut, diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh index 1f25fb233..9d9ab53ca 100644 --- a/src/libstore/build/goal.hh +++ b/src/libstore/build/goal.hh @@ -124,7 +124,7 @@ public: bool inBuildSlot; }; struct [[nodiscard]] Finished { - ExitCode result; + ExitCode exitCode; std::shared_ptr<Error> ex; bool permanentFailure = false; bool timedOut = false; diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index 0642754e8..f619d574d 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -156,7 +156,7 @@ void Worker::goalFinished(GoalPtr goal, Goal::Finished & f) { goal->trace("done"); assert(!goal->exitCode.has_value()); - goal->exitCode = f.result; + goal->exitCode = f.exitCode; goal->ex = f.ex; permanentFailure |= f.permanentFailure; @@ -171,11 +171,11 @@ void Worker::goalFinished(GoalPtr goal, Goal::Finished & f) waiting->trace(fmt("waitee '%s' done; %d left", goal->name, waiting->waitees.size())); - if (f.result != Goal::ecSuccess) ++waiting->nrFailed; - if (f.result == Goal::ecNoSubstituters) ++waiting->nrNoSubstituters; - if (f.result == Goal::ecIncompleteClosure) ++waiting->nrIncompleteClosure; + if (f.exitCode != Goal::ecSuccess) ++waiting->nrFailed; + if (f.exitCode == Goal::ecNoSubstituters) ++waiting->nrNoSubstituters; + if (f.exitCode == Goal::ecIncompleteClosure) ++waiting->nrIncompleteClosure; - if (waiting->waitees.empty() || (f.result == Goal::ecFailed && !settings.keepGoing)) { + if (waiting->waitees.empty() || (f.exitCode == Goal::ecFailed && !settings.keepGoing)) { /* If we failed and keepGoing is not set, we remove all remaining waitees. */ for (auto & i : waiting->waitees) { |