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/worker.cc | |
| 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/worker.cc')
| -rw-r--r-- | src/libstore/build/worker.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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) { |