diff options
| author | Abderrahim Kitouni <akitouni@gnome.org> | 2019-01-28 11:01:08 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2019-02-08 16:42:23 +0000 |
| commit | 24c0de16faec2b8b9bd6a03504ce951dc49afbe2 (patch) | |
| tree | fa10a359f59c0c5f571a44065871eef286083676 /buildstream/_artifactcache.py | |
| parent | 1ee4a4ba3a91e27515967d5e2daaedf664f10c78 (diff) | |
| download | buildstream-24c0de16faec2b8b9bd6a03504ce951dc49afbe2.tar.gz | |
_project.py: use artifact caches from the parent project for junctionsabderrahim/artifact-cache-junction
This makes a junction use the artifact cache of the parent project
before the ones defined for the junction
Fixes #401
Diffstat (limited to 'buildstream/_artifactcache.py')
| -rw-r--r-- | buildstream/_artifactcache.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/buildstream/_artifactcache.py b/buildstream/_artifactcache.py index de63d30f1..5404dc12e 100644 --- a/buildstream/_artifactcache.py +++ b/buildstream/_artifactcache.py @@ -1046,8 +1046,5 @@ class ArtifactCache(): # A list of ArtifactCacheSpec instances describing the remote artifact caches. # def _configured_remote_artifact_cache_specs(context, project): - project_overrides = context.get_overrides(project.name) - project_extra_specs = ArtifactCache.specs_from_config_node(project_overrides) - return list(utils._deduplicate( - project_extra_specs + project.artifact_cache_specs + context.artifact_cache_specs)) + project.artifact_cache_specs + context.artifact_cache_specs)) |