Skip to content

Commit

Permalink
Merge pull request #4389 from hercules-ci/backport-issue-3964-substit…
Browse files Browse the repository at this point in the history
…ution-loop

Backport issue 3964 substitution loop
  • Loading branch information
domenkozar authored Dec 25, 2020
2 parents 8803753 + 8388e2e commit 0828ace
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/libstore/build.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1222,8 +1222,13 @@ void DerivationGoal::outputsSubstituted()

/* If the substitutes form an incomplete closure, then we should
build the dependencies of this derivation, but after that, we
can still use the substitutes for this derivation itself. */
if (nrIncompleteClosure > 0) retrySubstitution = true;
can still use the substitutes for this derivation itself.
If the nrIncompleteClosure != nrFailed, we have another issue as well.
In particular, it may be the case that the hole in the closure is
an output of the current derivation, which causes a loop if retried.
*/
if (nrIncompleteClosure > 0 && nrIncompleteClosure == nrFailed) retrySubstitution = true;

nrFailed = nrNoSubstituters = nrIncompleteClosure = 0;

Expand Down

0 comments on commit 0828ace

Please sign in to comment.