diff options
author | Félix Baylac-Jacqué <felix@alternativebit.fr> | 2022-08-01 11:37:21 +0200 |
---|---|---|
committer | Félix Baylac-Jacqué <felix@alternativebit.fr> | 2022-08-01 11:39:19 +0200 |
commit | 1467a98d4c2014e512825c87e9056de79408421a (patch) | |
tree | a569f4bd570da1f81a0cddb3451814c5e08a0a56 /src | |
parent | e9178d7d4a9d3f689f911440fa71f135e55b570b (diff) |
derivation-goal.cc: remove bmCheck custom return branch on buildDone
Once a derivation goal has been completed, we check whether or not
this goal was meant to be repeated to check its output.
An early return branch was preventing the worker to reach that repeat
code branch, hence breaking the --check command (#2619).
It seems like this early return branch is an artifact of a passed
refactoring. As far as I can tell, buildDone's main branch also
cleanup the tmp directory before returning.
Diffstat (limited to 'src')
-rw-r--r-- | src/libstore/build/derivation-goal.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 3fff2385f..3c0b14029 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -914,12 +914,6 @@ void DerivationGoal::buildDone() outputPaths ); - if (buildMode == bmCheck) { - cleanupPostOutputsRegisteredModeCheck(); - done(BuildResult::Built, std::move(builtOutputs)); - return; - } - cleanupPostOutputsRegisteredModeNonCheck(); /* Repeat the build if necessary. */ |