aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/build/worker.cc
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-08-25 13:41:56 +0200
committereldritch horrors <pennae@lix.systems>2024-08-30 11:13:07 +0000
commite55ec75619b775bf0f5dd60e3da8de9bc8235f68 (patch)
tree15492866df30bfa2b5cdc77a0302b7565e16ded2 /src/libstore/build/worker.cc
parent869666cb651f97cdce3a6aabf62073bfe1130cbb (diff)
libstore: print dependency errors from DerivationGoal
this is not ideal, but it's better than having this stuck in the worker loop itself. setting ex on all failing goals is not problematic because only toplevel goals can ever be observable, all the others are ignored. notably only derivation goals ever set `ex`, substitution goals do not. Change-Id: I02e2164487b2955df053fef3c8e774d557aa638a
Diffstat (limited to 'src/libstore/build/worker.cc')
-rw-r--r--src/libstore/build/worker.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc
index 5d0cc920a..7336ad50f 100644
--- a/src/libstore/build/worker.cc
+++ b/src/libstore/build/worker.cc
@@ -157,19 +157,13 @@ void Worker::goalFinished(GoalPtr goal, Goal::Finished & f)
goal->trace("done");
assert(!goal->exitCode.has_value());
goal->exitCode = f.result;
+ goal->ex = f.ex;
permanentFailure |= f.permanentFailure;
timedOut |= f.timedOut;
hashMismatch |= f.hashMismatch;
checkMismatch |= f.checkMismatch;
- if (f.ex) {
- if (!goal->waiters.empty())
- logError(f.ex->info());
- else
- goal->ex = f.ex;
- }
-
for (auto & i : goal->waiters) {
if (GoalPtr waiting = i.lock()) {
assert(waiting->waitees.count(goal));