Browse Source

daemon: Unregister build hook from the worker's children upon build failure.

Fixes <https://bugs.gnu.org/38062>.
This is a followup to ada9a19a2d.

* nix/libstore/build.cc (DerivationGoal::killChild): Add conditional
call to 'worker.childTerminated' for 'hook->pid'.
wip-system-bootstrap
Ludovic Courtès 3 years ago
parent
commit
af73beeba1
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 5
      nix/libstore/build.cc

5
nix/libstore/build.cc

@ -947,6 +947,11 @@ void DerivationGoal::killChild()
assert(pid == -1);
}
/* If there was a build hook involved, remove it from the worker's
children. */
if (hook && hook->pid != -1) {
worker.childTerminated(hook->pid);
}
hook.reset();
}

Loading…
Cancel
Save