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:32:41 UTC

[buildstream] 01/02: _project: Guard against addition of None to list

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

not-in-ldap pushed a commit to branch traveltissues/fix-Nonetype-guard
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 6469757d851df8cdc9c54ab6e87e8d0edd91579f
Author: Darius Makovsky <tr...@protonmail.com>
AuthorDate: Thu May 28 10:07:50 2020 +0100

    _project: Guard against addition of None to list
    
    When parent.artifact_cache_specs are None `+` is not a valid operation
---
 src/buildstream/_project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py
index 21dc2b9..c396408 100644
--- a/src/buildstream/_project.py
+++ b/src/buildstream/_project.py
@@ -848,7 +848,7 @@ class Project:
             if self.junction.ignore_junction_remotes:
                 self.artifact_cache_specs = []
 
-            if self.junction.cache_junction_elements:
+            if self.junction.cache_junction_elements and parent.artifact_cache_specs:
                 self.artifact_cache_specs = parent.artifact_cache_specs + self.artifact_cache_specs
 
         # Load source caches with pull/push config