From fc987b412385a3b10d58eabd516acc7ff3b27b11 Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Fri, 2 Aug 2024 17:00:57 +0200
Subject: libstore: remove Goal::addWaitee

Change-Id: I1b00d1a537d84790878cb0e81aaa1cbaa143d62d
---
 src/libstore/build/drv-output-substitution-goal.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/libstore/build/drv-output-substitution-goal.cc')

diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc
index 068f41a49..b41dae5d6 100644
--- a/src/libstore/build/drv-output-substitution-goal.cc
+++ b/src/libstore/build/drv-output-substitution-goal.cc
@@ -100,6 +100,7 @@ Goal::WorkResult DrvOutputSubstitutionGoal::realisationFetched()
         return tryNext();
     }
 
+    WaitForGoals result;
     for (const auto & [depId, depPath] : outputInfo->dependentRealisations) {
         if (depId != id) {
             if (auto localOutputInfo = worker.store.queryRealisation(depId);
@@ -115,17 +116,17 @@ Goal::WorkResult DrvOutputSubstitutionGoal::realisationFetched()
                 );
                 return tryNext();
             }
-            addWaitee(worker.makeDrvOutputSubstitutionGoal(depId));
+            result.goals.insert(worker.makeDrvOutputSubstitutionGoal(depId));
         }
     }
 
-    addWaitee(worker.makePathSubstitutionGoal(outputInfo->outPath));
+    result.goals.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));
 
-    if (waitees.empty()) {
+    if (result.goals.empty()) {
         return outPathValid();
     } else {
         state = &DrvOutputSubstitutionGoal::outPathValid;
-        return StillAlive{};
+        return result;
     }
 }
 
-- 
cgit v1.2.3