diff options
| author | James Ennis <james.ennis@codethink.co.uk> | 2019-06-25 16:38:48 +0100 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.co.uk> | 2019-06-25 17:11:30 +0100 |
| commit | 8fbe6482e08b8b9f3838ba416b1d7c989ccf555b (patch) | |
| tree | c83b67e89da80064076b4fab55660d0c3859b32d | |
| parent | 9f9d5aba402c3912feaaf29b6e4b1b8bd82dbd56 (diff) | |
| download | buildstream-jennis/do_not_leak_project_specific_remotes.tar.gz | |
_basecache.py: Remove duplicate logicjennis/do_not_leak_project_specific_remotes
project_overrides and project_extra_specs were moved in 24c0de16.
However, their removal was accidentally reverted in f4dbce44.
This patch removes the unnecessary code.
| -rw-r--r-- | src/buildstream/_basecache.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/buildstream/_basecache.py b/src/buildstream/_basecache.py index b600bbea8..49930d4ca 100644 --- a/src/buildstream/_basecache.py +++ b/src/buildstream/_basecache.py @@ -103,14 +103,10 @@ class BaseCache(): # @classmethod def _configured_remote_cache_specs(cls, context, project): - project_overrides = context.get_overrides(project.name) - project_extra_specs = cls.specs_from_config_node(project_overrides) - project_specs = getattr(project, cls.spec_name) context_specs = getattr(context, cls.spec_name) - return list(utils._deduplicate( - project_extra_specs + project_specs + context_specs)) + return list(utils._deduplicate(project_specs + context_specs)) # setup_remotes(): # |