fixup! Test with Unique PQ for update state recursive

1 files changed, 10 insertions, 8 deletions

diff --git a/buildstream/element.py b/buildstream/element.py
index dcceaef5e..91d8e6068 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -216,8 +216,10 @@ class Element(Plugin):
 
         self.__runtime_dependencies = []        # Direct runtime dependency Elements
         self.__build_dependencies = []          # Direct build dependency Elements
-        self.__direct_reverse_dependencies_for_build = []  # Direct reverse dependency Elements
-        self.__direct_reverse_dependencies_for_runtime = []
+        self.__reverse_dependencies_for_build = []  # Direct reverse dependency Elements that have a BUILD dependency on us
+        self.__reverse_dependencies_for_runtime = []  # Direct reverse dependency Elements that have a RUN dependency on us
+        # number of runtime dependency keys to discover before we can be used as
+        # a reverse dependency
         self.__remaining_runtime_deps_cache_keys_to_discover = 0
         self.__sources = []                     # List of Sources
         self.__weak_cache_key = None            # Our cached weak cache key
@@ -990,14 +992,14 @@ class Element(Plugin):
         for meta_dep in meta.dependencies:
             dependency = Element._new_from_meta(meta_dep)
             element.__runtime_dependencies.append(dependency)
-            dependency.__direct_reverse_dependencies_for_runtime.append(element)
+            dependency.__reverse_dependencies_for_runtime.append(element)
 
         element.__remaining_runtime_deps_cache_keys_to_discover = len(meta.dependencies)
 
         for meta_dep in meta.build_dependencies:
             dependency = Element._new_from_meta(meta_dep)
             element.__build_dependencies.append(dependency)
-            dependency.__direct_reverse_dependencies_for_build.append(element)
+            dependency.__reverse_dependencies_for_build.append(element)
 
         return element
 
@@ -1287,7 +1289,7 @@ class Element(Plugin):
                 while queue:
                     elem = queue.pop()
 
-                    for rdep in elem.__direct_reverse_dependencies_for_runtime:
+                    for rdep in elem.__reverse_dependencies_for_runtime:
                         rdep.__remaining_runtime_deps_cache_keys_to_discover -= 1
 
                         if (
@@ -2970,9 +2972,9 @@ class Element(Plugin):
         queue.push(self.__node_id, self)
 
         def enqueue_skiplevel(element):
-            for rdep in element.__direct_reverse_dependencies_for_runtime:
+            for rdep in element.__reverse_dependencies_for_runtime:
                 if rdep.__remaining_runtime_deps_cache_keys_to_discover == 0:
-                    for rrdep in rdep.__direct_reverse_dependencies_for_build:
+                    for rrdep in rdep.__reverse_dependencies_for_build:
                         queue.push(rrdep.__node_id, rrdep)
 
                     # If something depending on us at runtime is ready too, their
@@ -2989,7 +2991,7 @@ class Element(Plugin):
             element._update_state()
 
             if element.__cache_key != old_cache_key or old_weak_cache_key != element.__weak_cache_key:
-                for rdep in element.__direct_reverse_dependencies_for_build:
+                for rdep in element.__reverse_dependencies_for_build:
                     queue.push(rdep.__node_id, rdep)
 
             if element.__remaining_runtime_deps_cache_keys_to_discover == 0 and element.__cache_key != old_cache_key: