summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2018-11-02 08:40:10 +0100
committerJürg Billeter <j@bitron.ch>2018-11-05 17:18:12 +0000
commit0085d2aae8c669a597fc4f1a74eff38340d107ee (patch)
tree662248906f42c1e2a932e7b9e429301bb8636cb5
parent15fed21c9a1c3150dd0911e59597e284cd3526e7 (diff)
downloadbuildstream-0085d2aae8c669a597fc4f1a74eff38340d107ee.tar.gz
element.py: Remove unused artifacts parameter from _new_from_meta()
-rw-r--r--buildstream/_loader/loader.py2
-rw-r--r--buildstream/_project.py2
-rw-r--r--buildstream/element.py7
3 files changed, 5 insertions, 6 deletions
diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py
index 8a81a71c1..22600b9e9 100644
--- a/buildstream/_loader/loader.py
+++ b/buildstream/_loader/loader.py
@@ -537,7 +537,7 @@ class Loader():
raise LoadError(LoadErrorReason.INVALID_DATA,
"{}: Expected junction but element kind is {}".format(filename, meta_element.kind))
- element = Element._new_from_meta(meta_element, self._context.artifactcache)
+ element = Element._new_from_meta(meta_element)
element._preflight()
sources = list(element.sources())
diff --git a/buildstream/_project.py b/buildstream/_project.py
index d62077de0..c43510b71 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -322,7 +322,7 @@ class Project():
with self._context.timed_activity("Resolving elements"):
elements = [
- Element._new_from_meta(meta, artifacts)
+ Element._new_from_meta(meta)
for meta in meta_elements
]
diff --git a/buildstream/element.py b/buildstream/element.py
index e60daf529..05da2fb4f 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -872,14 +872,13 @@ class Element(Plugin):
# and its dependencies from a meta element.
#
# Args:
- # artifacts (ArtifactCache): The artifact cache
# meta (MetaElement): The meta element
#
# Returns:
# (Element): A newly created Element instance
#
@classmethod
- def _new_from_meta(cls, meta, artifacts):
+ def _new_from_meta(cls, meta):
if not meta.first_pass:
meta.project.ensure_fully_loaded()
@@ -904,10 +903,10 @@ class Element(Plugin):
# Instantiate dependencies
for meta_dep in meta.dependencies:
- dependency = Element._new_from_meta(meta_dep, artifacts)
+ dependency = Element._new_from_meta(meta_dep)
element.__runtime_dependencies.append(dependency)
for meta_dep in meta.build_dependencies:
- dependency = Element._new_from_meta(meta_dep, artifacts)
+ dependency = Element._new_from_meta(meta_dep)
element.__build_dependencies.append(dependency)
return element