From 958ddebf9057f0e16f396589f62ace66e6e67f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Tue, 7 Apr 2020 18:26:57 +0200 Subject: _artifact.py: Use CASCache.contains_directory_and_blobs() --- src/buildstream/_artifact.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/buildstream/_artifact.py b/src/buildstream/_artifact.py index 0e1355f34..10885f7dc 100644 --- a/src/buildstream/_artifact.py +++ b/src/buildstream/_artifact.py @@ -433,12 +433,10 @@ class Artifact: require_files = context.require_artifact_files or self._element._artifact_files_required() # Check whether 'files' subdirectory is available, with or without file contents - if str(artifact.files) and not self._cas.contains_directory(artifact.files, with_files=require_files): - self._cached = False - return False - # Check whether public data is available - if not self._cas.contains_file(artifact.public_data): + if not self._cas.contains_directory_and_blobs( + artifact.files, [artifact.public_data], with_files=require_files + ): self._cached = False return False -- cgit v1.2.1