diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/build/drv-output-substitution-goal.cc | 4 | ||||
| -rw-r--r-- | src/libstore/build/worker.hh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index 5e83d769c..94c9206a3 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -41,13 +41,13 @@ void DrvOutputSubstitutionGoal::tryNext() /* Make sure that we are allowed to start a substitution. Note that even if maxSubstitutionJobs == 0, we still allow a substituter to run. This prevents infinite waiting. */ - if (worker.runningCASubstitutions >= std::max(1U, settings.maxSubstitutionJobs.get())) { + if (worker.runningSubstitutions >= std::max(1U, settings.maxSubstitutionJobs.get())) { worker.waitForBuildSlot(shared_from_this()); return; } maintainRunningSubstitutions = - std::make_unique<MaintainCount<uint64_t>>(worker.runningCASubstitutions); + std::make_unique<MaintainCount<uint64_t>>(worker.runningSubstitutions); if (subs.size() == 0) { /* None left. Terminate this goal and let someone else deal diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index eee47e23d..3984c9c1c 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -146,7 +146,6 @@ public: uint64_t doneSubstitutions = 0; uint64_t failedSubstitutions = 0; uint64_t runningSubstitutions = 0; - uint64_t runningCASubstitutions = 0; uint64_t expectedDownloadSize = 0; uint64_t doneDownloadSize = 0; uint64_t expectedNarSize = 0; |