summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan van Berkom <tristan@codethink.co.uk>2020-09-09 17:06:02 +0900
committerTristan van Berkom <tristan@codethink.co.uk>2020-09-18 12:36:34 +0900
commit4dcc087b1e6db039708c5cb11b37fb6ebd27d2c1 (patch)
treeac046cd0e52d0857cdd1c5360ccf3edbe0538c8b /src
parent1656082576b8e4ab67cb16300ad75c60954cb420 (diff)
downloadbuildstream-4dcc087b1e6db039708c5cb11b37fb6ebd27d2c1.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/buildstream/plugins/elements/compose.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/buildstream/plugins/elements/compose.py b/src/buildstream/plugins/elements/compose.py
index 808419675..0d49884f6 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():