nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

DerivationBuildingGoal::done* restore outputLocks.unlock()

Browse source 
This was accidentally removed in
169033001d.
This commit is contained in:
John Ericson 2025-08-29 17:49:11 -04:00
parent d50d4b01c7
commit a8c4cfae26
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/derivation-building-goal.cc
View file

@ -1304,6 +1304,7 @@ SingleDrvOutputs DerivationBuildingGoal::assertPathValidity()
Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs) Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs)
{ {
outputLocks.unlock();
buildResult.status = status; buildResult.status = status;
assert(buildResult.success()); assert(buildResult.success());
@ -1321,6 +1322,7 @@ Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, Singl
Goal::Done DerivationBuildingGoal::doneFailure(BuildError ex) Goal::Done DerivationBuildingGoal::doneFailure(BuildError ex)
{ {
outputLocks.unlock();
buildResult.status = ex.status; buildResult.status = ex.status;
buildResult.errorMsg = fmt("%s", Uncolored(ex.info().msg)); buildResult.errorMsg = fmt("%s", Uncolored(ex.info().msg));
if (buildResult.status == BuildResult::TimedOut) if (buildResult.status == BuildResult::TimedOut)