summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-14 17:03:09 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-21 10:44:47 +0000
commit45cfd914458d8b5e9418e3c7759fdc5e9f7a30c6 (patch)
tree3c88eca62857a32f7b74360a3b887422cc874714
parent1365efb0bed89a7d7d019b9823fe96bd09d8e962 (diff)
downloadimport-45cfd914458d8b5e9418e3c7759fdc5e9f7a30c6.tar.gz
Don't hardcode stratum build depends
-rw-r--r--baserockimport/mainloop.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py
index 580a890..21b68e6 100644
--- a/baserockimport/mainloop.py
+++ b/baserockimport/mainloop.py
@@ -141,7 +141,7 @@ class ImportLoop(object):
self.importers = {}
- def enable_importer(self, kind, extra_args=[]):
+ def enable_importer(self, kind, extra_args=[], **kwargs):
'''Enable an importer extension in this ImportLoop instance.
At least one importer extension must be enabled for the loop to do
@@ -155,7 +155,8 @@ class ImportLoop(object):
'''
assert kind not in self.importers
self.importers[kind] = {
- 'extra_args': extra_args
+ 'extra_args': extra_args,
+ 'kwargs': kwargs
}
def run(self):
@@ -589,14 +590,18 @@ class ImportLoop(object):
}
chunk_entries.append(entry)
+ kwargs = self.importers[kind]['kwargs']
+
+ stratum_build_depends = (
+ [{'morph': stratum} for stratum in kwargs['strata']]
+ if 'strata' in kwargs else [])
+
stratum_name = goal_name
stratum = {
'name': stratum_name,
'kind': 'stratum',
'description': 'Autogenerated by Baserock import tool',
- 'build-depends': [
- {'morph': 'strata/ruby.morph'}
- ],
+ 'build-depends': stratum_build_depends,
'chunks': chunk_entries,
}