mirror of
https://github.com/NixOS/nix.git
synced 2025-12-06 09:01:01 +01:00
Revert "Revert "Revert "Adapt scheduler to work with dynamic derivations"""
The bug reappeared after all, and the fix introduced a different bug. I
just reverted on 2.27 first, in #12576, but upon further introspection
and discussion with @roberth, with preparing for and travelling to
Planet Nix I will not be able to fix it on `master` soon enough for a
revert to not be warranted here in the meantime also.
This reverts commit c98525235f.
This commit is contained in:
parent
7cfc52fd42
commit
f4f28cdd0e
16 changed files with 45 additions and 374 deletions
|
|
@ -175,7 +175,7 @@ Goal::Done Goal::amDone(ExitCode result, std::optional<Error> ex)
|
|||
exitCode = result;
|
||||
|
||||
if (ex) {
|
||||
if (!preserveException && !waiters.empty())
|
||||
if (!waiters.empty())
|
||||
logError(ex->info());
|
||||
else
|
||||
this->ex = std::move(*ex);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue