This is an automated email from the ASF dual-hosted git repository.

not-in-ldap pushed a commit to branch tristan/multi-location-overlaps
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 285793686b214c006ec0a23aa30a5a6267bab3e4
Author: Tristan van Berkom <[email protected]>
AuthorDate: Thu Sep 10 21:34:50 2020 +0900

    filter plugin: Stage the artifacts in Element.stage()
    
    Staging artifacts at Element.assemble() time is now illegal
---
 src/buildstream/plugins/elements/filter.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/buildstream/plugins/elements/filter.py 
b/src/buildstream/plugins/elements/filter.py
index c817ca4..783079c 100644
--- a/src/buildstream/plugins/elements/filter.py
+++ b/src/buildstream/plugins/elements/filter.py
@@ -219,9 +219,6 @@ class FilterElement(Element):
         pass
 
     def stage(self, sandbox):
-        pass
-
-    def assemble(self, sandbox):
         with self.timed_activity("Staging artifact", silent_nested=True):
             for dep in self.dependencies(recurse=False):
                 # Check that all the included/excluded domains exist
@@ -250,6 +247,8 @@ class FilterElement(Element):
                     raise ElementError("Unknown domains declared.", 
detail=detail)
 
                 dep.stage_artifact(sandbox, include=self.include, 
exclude=self.exclude, orphans=self.include_orphans)
+
+    def assemble(self, sandbox):
         return ""
 
     def _get_source_element(self):

Reply via email to