summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-02-23 16:07:15 +0100
committerJürg Billeter <j@bitron.ch>2019-02-26 13:06:53 +0100
commit9f6a3332812f4caa036084f843cf95b9c6b9181f (patch)
tree524798d01f196556134da36df84cb03dae34a0b0
parentf832aad89045bf37cdd8df9f574618ef3cd8f133 (diff)
downloadbuildstream-9f6a3332812f4caa036084f843cf95b9c6b9181f.tar.gz
compose.py: Replace file list with filter callback
-rw-r--r--buildstream/plugins/elements/compose.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/buildstream/plugins/elements/compose.py b/buildstream/plugins/elements/compose.py
index d61a324cc..12520ce4c 100644
--- a/buildstream/plugins/elements/compose.py
+++ b/buildstream/plugins/elements/compose.py
@@ -178,9 +178,12 @@ class ComposeElement(Element):
detail = "\n".join(lines)
+ def import_filter(path):
+ return path in manifest
+
with self.timed_activity("Creating composition", detail=detail, silent_nested=True):
self.info("Composing {} files".format(len(manifest)))
- installdir.import_files(vbasedir, files=manifest, can_link=True)
+ installdir.import_files(vbasedir, filter_callback=import_filter, can_link=True)
# And we're done
return os.path.join(os.sep, 'buildstream', 'install')