[buildstream] 01/09: compose plugin: Stage the artifacts in Element.stage()

[no...@apache.org]

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 3d799d4804e0c0d1438c80b49dc859debeb196e4
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Wed Sep 9 17:06:02 2020 +0900

    compose plugin: Stage the artifacts in Element.stage()
    
    It will now be illegal to call Element.stage_dependency_artifacts() outside
    of the Element.stage() abstract method.
---
 src/buildstream/plugins/elements/compose.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/buildstream/plugins/elements/compose.py b/src/buildstream/plugins/elements/compose.py
index 8084196..0d49884 100644
--- a/src/buildstream/plugins/elements/compose.py
+++ b/src/buildstream/plugins/elements/compose.py
@@ -82,17 +82,15 @@ class ComposeElement(Element):
         pass
 
     def stage(self, sandbox):
-        pass
-
-    def assemble(self, sandbox):
-
-        require_split = self.include or self.exclude or not self.include_orphans
 
         # Stage deps in the sandbox root
         with self.timed_activity("Staging dependencies", silent_nested=True):
             self.stage_dependency_artifacts(sandbox)
 
+    def assemble(self, sandbox):
         manifest = set()
+
+        require_split = self.include or self.exclude or not self.include_orphans
         if require_split:
             with self.timed_activity("Computing split", silent_nested=True):
                 for dep in self.dependencies():