diff options
| author | James Ennis <james.ennis@codethink.co.uk> | 2019-06-25 12:24:26 +0100 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.com> | 2019-08-06 13:03:47 +0000 |
| commit | 34529551faf0c1206e5fe887355da882a5c32c9e (patch) | |
| tree | 86de24b70d823ac0d7213a6358026243840d61af /src/buildstream/_project.py | |
| parent | 5e475b9cdadc07272bc4cd4d0977422ec241a785 (diff) | |
| download | buildstream-34529551faf0c1206e5fe887355da882a5c32c9e.tar.gz | |
_project.py: Revert back to not caching junctioned elements
Originally, the intended default behaviour of BuildStream was to
only cache project elements in project specific remotes.
This behaviour was broken by: 24c0de16faec2b8b9bd6a03504ce951dc49afbe2.
Introduced in !1113.
This patch reverts the behaviour and asserts that junctioned elements
are not pushed to their parent's project-specific remote.
Diffstat (limited to 'src/buildstream/_project.py')
| -rw-r--r-- | src/buildstream/_project.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index 9428ab4f6..8d06c7cef 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -643,15 +643,7 @@ class Project(): # # Load artifacts pull/push configuration for this project - project_specs = ArtifactCache.specs_from_config_node(config, self.directory) - override_specs = ArtifactCache.specs_from_config_node( - self._context.get_overrides(self.name), self.directory) - - self.artifact_cache_specs = override_specs + project_specs - - if self.junction: - parent = self.junction._get_project() - self.artifact_cache_specs = parent.artifact_cache_specs + self.artifact_cache_specs + self.artifact_cache_specs = ArtifactCache.specs_from_config_node(config, self.directory) # Load source caches with pull/push config self.source_cache_specs = SourceCache.specs_from_config_node(config, self.directory) |