Commit f2e99bc7 authored by Jürg Billeter's avatar Jürg Billeter
Browse files

element.py: Remove unused artifacts parameter from _new_from_meta()

parent fe916c59

buildstream/_loader/loader.py

+1 −1
Original line number Diff line number Diff line
@@ -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())

buildstream/_project.py

+1 −1
Original line number Diff line number Diff line
@@ -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

            ]

buildstream/element.py

+3 −4
Original line number Diff line number Diff line
@@ -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