summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2020-05-28 10:07:50 +0100
committerDarius Makovsky <traveltissues@protonmail.com>2020-07-06 08:45:34 +0100
commit6469757d851df8cdc9c54ab6e87e8d0edd91579f (patch)
treec61dcfaa2b21c61512371eb8518bb403d6fb0f49
parent94dcc28121a57f5e292ce653ef4b760a7ad3b6a4 (diff)
downloadbuildstream-6469757d851df8cdc9c54ab6e87e8d0edd91579f.tar.gz
_project: Guard against addition of None to list
When parent.artifact_cache_specs are None `+` is not a valid operation
-rw-r--r--src/buildstream/_project.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py
index 21dc2b9d2..c396408b0 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