You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by no...@apache.org on 2020/12/29 12:54:12 UTC

[buildstream] 03/10: _artifact.py: Do not use `Context.require_artifact_directories`

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

not-in-ldap pushed a commit to branch juerg/public-data
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 9f7fafafbf90e81752d3205ebd062f3f47147907
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Tue Apr 7 17:51:48 2020 +0200

    _artifact.py: Do not use `Context.require_artifact_directories`
    
    It is always `True`.
---
 src/buildstream/_artifact.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/buildstream/_artifact.py b/src/buildstream/_artifact.py
index 659facb..0e1355f 100644
--- a/src/buildstream/_artifact.py
+++ b/src/buildstream/_artifact.py
@@ -429,17 +429,11 @@ class Artifact:
             self._cached = False
             return False
 
-        # Determine whether directories are required
-        require_directories = context.require_artifact_directories
         # Determine whether file contents are required as well
         require_files = context.require_artifact_files or self._element._artifact_files_required()
 
         # Check whether 'files' subdirectory is available, with or without file contents
-        if (
-            require_directories
-            and str(artifact.files)
-            and not self._cas.contains_directory(artifact.files, with_files=require_files)
-        ):
+        if str(artifact.files) and not self._cas.contains_directory(artifact.files, with_files=require_files):
             self._cached = False
             return False