diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-20 14:57:21 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-20 14:57:21 +0000 |
| commit | 3d77f1583fd020ce5c18da1fa3c01d40784c2abd (patch) | |
| tree | e6887c58808b83140bbb459568c38d0591b0a23a /src/buildstream/_sourcecache.py | |
| parent | 74bbafa4c29caff91574316fb25fe2a5f9ff5fbf (diff) | |
| parent | f42205787e33174408012e5de3e3576acaab9f9b (diff) | |
| download | buildstream-3d77f1583fd020ce5c18da1fa3c01d40784c2abd.tar.gz | |
Merge branch 'juerg/artifact-blob-not-found' into 'master'
Fix handling of missing blobs in `ArtifactCache.pull()`
Closes #1276
See merge request BuildStream/buildstream!1843
Diffstat (limited to 'src/buildstream/_sourcecache.py')
| -rw-r--r-- | src/buildstream/_sourcecache.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py index e485fbd47..4533a2580 100644 --- a/src/buildstream/_sourcecache.py +++ b/src/buildstream/_sourcecache.py @@ -242,11 +242,7 @@ class SourceCache(BaseCache): self.cas._fetch_directory(remote, source_proto.files) required_blobs = self.cas.required_blobs_for_directory(source_proto.files) missing_blobs = self.cas.local_missing_blobs(required_blobs) - missing_blobs = self.cas.fetch_blobs(remote, missing_blobs) - - if missing_blobs: - source.info("Remote cas ({}) does not have source {} cached".format(remote, display_key)) - continue + self.cas.fetch_blobs(remote, missing_blobs) source.info("Pulled source {} <- {}".format(display_key, remote)) return True |