diff options
Diffstat (limited to 'baserockimport/mainloop.py')
| -rw-r--r-- | baserockimport/mainloop.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py index b400695..057ab98 100644 --- a/baserockimport/mainloop.py +++ b/baserockimport/mainloop.py @@ -58,6 +58,7 @@ def run_extension(filename, args): output.append(line) def report_extension_stderr(line): + logging.debug('Received "%s" on stderr' % line) errors.append(line) def report_extension_logger(line): @@ -115,7 +116,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 @@ -129,7 +130,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,18 +591,22 @@ class ImportLoop(object): 'ref': m.ref, 'unpetrify-ref': m.named_ref, 'morph': m.filename, - 'build-depends': build_depends, + 'build-depends': build_depends } 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, } |