pullqueue.py: Update skip rules

1 files changed, 13 insertions, 1 deletions

diff --git a/buildstream/_scheduler/pullqueue.py b/buildstream/_scheduler/pullqueue.py
index 4a6cafc1c..b21267eb3 100644
--- a/buildstream/_scheduler/pullqueue.py
+++ b/buildstream/_scheduler/pullqueue.py
@@ -39,7 +39,19 @@ class PullQueue(Queue):
         return element._pull()
 
     def skip(self, element):
-        return element._cached(strength=_KeyStrength.STRONG)
+        if element._cached(strength=_KeyStrength.STRONG):
+            return True
+        elif element._remotely_cached(strength=_KeyStrength.STRONG):
+            # pull artifact using strong key
+            return False
+        elif element._cached():
+            return True
+        elif element._remotely_cached():
+            # pull artifact using weak key
+            return False
+        else:
+            # nothing to pull
+            return True
 
     def done(self, element, result, returncode):