summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2018-11-02 08:40:10 +0100
committerJavier Jardón <jjardon@gnome.org>2020-07-30 10:22:53 +0000
commit3998807036696a9c109029f8224eb8f9bd1d7188 (patch)
tree8151e80b402a0761bf288cba7974024dd0635530
parente9f34c3ce001a6c8581951b562c1ac005381151e (diff)
downloadbuildstream-3998807036696a9c109029f8224eb8f9bd1d7188.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 24f2b595b..df272dfcc 100644
--- a/buildstream/_loader/loader.py
+++ b/buildstream/_loader/loader.py
@@ -533,7 +533,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()
element._update_state()
diff --git a/buildstream/_project.py b/buildstream/_project.py
index 9a1a2f3dc..3dba17131 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -319,7 +319,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 78c5095dd..5c8a8d604 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -898,14 +898,13 @@ class Element(Plugin):
# and it's 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()
@@ -930,12 +929,12 @@ 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)
dependency.__reverse_dependencies.add(element)
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)
dependency.__reverse_dependencies.add(element)