From f0d49bcfeaccca30943c7fcccb5e3e8c196ac096 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Fri, 5 Dec 2014 18:15:10 +0000 Subject: Make stratum build-depends be set by importer --- baserockimport/mainloop.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py index b400695..8d0d563 100644 --- a/baserockimport/mainloop.py +++ b/baserockimport/mainloop.py @@ -115,7 +115,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 +129,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 +590,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, } -- cgit v1.2.1