From 1b8aa636445c267d5bc87fc1c0cf1a5aeffb3cad Mon Sep 17 00:00:00 2001 From: James Ennis Date: Tue, 25 Jun 2019 16:38:48 +0100 Subject: _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. --- src/buildstream/_basecache.py | 6 +----- 1 file changed, 1 insertion(+), 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(): # -- cgit v1.2.1