From 6593a492bd9892cef892ebc4378a5d221660658e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Sat, 3 Nov 2018 11:01:24 +0100 Subject: element.py: Remove artifacts parameter from constructor Get the artifact cache from the context instead. --- buildstream/_elementfactory.py | 2 +- buildstream/element.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildstream/_elementfactory.py b/buildstream/_elementfactory.py index 00847e66f..282648a6e 100644 --- a/buildstream/_elementfactory.py +++ b/buildstream/_elementfactory.py @@ -58,7 +58,7 @@ class ElementFactory(PluginContext): # def create(self, context, project, artifacts, meta): element_type, default_config = self.lookup(meta.kind) - element = element_type(context, project, artifacts, meta, default_config) + element = element_type(context, project, meta, default_config) version = self._format_versions.get(meta.kind, 0) self._assert_plugin_format(element, version) return element diff --git a/buildstream/element.py b/buildstream/element.py index 4942f5560..cfabd615e 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -179,7 +179,7 @@ class Element(Plugin): *Since: 1.2* """ - def __init__(self, context, project, artifacts, meta, plugin_conf): + def __init__(self, context, project, meta, plugin_conf): self.__cache_key_dict = None # Dict for cache key calculation self.__cache_key = None # Our cached cache key @@ -207,7 +207,7 @@ class Element(Plugin): self.__sources = [] # List of Sources self.__weak_cache_key = None # Our cached weak cache key self.__strict_cache_key = None # Our cached cache key for strict builds - self.__artifacts = artifacts # Artifact cache + self.__artifacts = context.artifactcache # Artifact cache self.__consistency = Consistency.INCONSISTENT # Cached overall consistency state self.__cached = None # Whether we have a cached artifact self.__strong_cached = None # Whether we have a cached artifact -- cgit v1.2.1