diff options
author | James Ennis <james.ennis@codethink.co.uk> | 2019-06-25 16:38:48 +0100 |
---|---|---|
committer | James Ennis <james.ennis@codethink.com> | 2019-06-26 08:36:20 +0000 |
commit | 1b8aa636445c267d5bc87fc1c0cf1a5aeffb3cad (patch) | |
tree | 17aecf4bf2ddf0ba4b99cccfb39986d1b37fe7ce | |
parent | 16d35b16a33cd21b6f039719a3ff66fbfc3758b4 (diff) | |
download | buildstream-1b8aa636445c267d5bc87fc1c0cf1a5aeffb3cad.tar.gz |
_basecache.py: Remove duplicate logic
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(): # |