[buildstream] 01/02: _stream.py: Do not connect artifact remote caches if pull is disabled

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch juerg/pull-non-strict
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit f283124901c432738b50df5f84ebb11764ebc2ae
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Wed Mar 24 11:02:20 2021 +0100

    _stream.py: Do not connect artifact remote caches if pull is disabled
    
    If artifact remote caches are available, elements are marked as pull
    pending in non-strict mode if the strict artifact is not in the local
    cache.
    
    Fixes #1469.
---
 src/buildstream/_stream.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index 8ff60df..d03480e 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -271,7 +271,7 @@ class Stream:
             elements = self.load_selection(
                 (target,),
                 selection=selection,
-                connect_artifact_cache=True,
+                connect_artifact_cache=pull_,
                 connect_source_cache=True,
                 artifact_remotes=artifact_remotes,
                 source_remotes=source_remotes,
@@ -670,7 +670,7 @@ class Stream:
             selection=selection,
             load_artifacts=True,
             attempt_artifact_metadata=True,
-            connect_artifact_cache=True,
+            connect_artifact_cache=pull,
             artifact_remotes=artifact_remotes,
             ignore_project_artifact_remotes=ignore_project_artifact_remotes,
         )
@@ -685,7 +685,7 @@ class Stream:
 
         self.query_cache(elements)
 
-        uncached_elts = [elt for elt in elements if not elt._cached()]
+        uncached_elts = [elt for elt in elements if elt._pull_pending()]
         if uncached_elts and pull:
             self._context.messenger.info("Attempting to fetch missing or incomplete artifact")
             self._reset()