--- morphlib/plugins/branch_and_merge_plugin.py | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index c768103..6d8387e 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -273,8 +273,43 @@ class BranchAndMergePlugin(cliapp.Plugin): raise morphlib.Error("Error parsing %s: %s" % (filename, str(e))) + self._validate_morphology(morphology, '%s.morph' % name) + return morphology + def _validate_morphology(self, morphology, basename): + # FIXME: This really should be in MorphologyFactory. Later. + + def require(field): + if field not in morphology: + raise morphlib.Error( + 'Required field "%s" is missing from morphology %s' % + (field, basename)) + + required = { + 'system': [ + 'name', + 'system-kind', + 'arch', + 'strata', + ], + 'stratum': [ + 'name', + 'chunks', + ], + 'chunk': [ + 'name', + ] + } + + require('kind') + kind = morphology['kind'] + if kind not in required: + raise morphlib.Error( + 'Unknown morphology kind "%s" in %s' % (kind, basename)) + for field in required[kind]: + require(field) + def reset_work_tree_safe(self, repo_dir): # This function avoids throwing any exceptions, so it is safe to call # inside an 'except' block without altering the backtrace. -- 1.7.10.4

--- morphlib/buildcommand.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 34468f1..aa6c7d0 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -79,6 +79,10 @@ class BuildCommand(object): self.app.status(msg='Creating source pool', chatty=True) srcpool = self.app.create_source_pool( self.lrc, self.rrc, (repo_name, ref, filename)) + + self.app.status( + msg='Validating cross-morphology references', chatty=True) + self._validate_cross_morphology_references(srcpool) self.app.status(msg='Creating artifact resolver', chatty=True) ar = morphlib.artifactresolver.ArtifactResolver() @@ -96,6 +100,45 @@ class BuildCommand(object): return order + def _validate_cross_morphology_references(self, srcpool): + for src in srcpool: + kind = src.morphology['kind'] + method_name = '_validate_cross_refs_for_%s' % kind + if hasattr(self, method_name): + logging.debug('Calling %s' % method_name) + getattr(self, method_name)(src, srcpool) + else: + logging.warning('No %s' % method_name) + + def _validate_cross_refs_for_system(self, src, srcpool): + self._validate_cross_refs_for_xxx( + src, srcpool, src.morphology['strata'], 'stratum') + + def _validate_cross_refs_for_stratum(self, src, srcpool): + self._validate_cross_refs_for_xxx( + src, srcpool, src.morphology['chunks'], 'chunk') + + def _validate_cross_refs_for_xxx(self, src, srcpool, specs, wanted): + for spec in specs: + repo_name = spec['repo'] + ref = spec['ref'] + filename = '%s.morph' % spec['morph'] + logging.debug( + 'Validating cross ref to %s:%s:%s' % + (repo_name, ref, filename)) + other = srcpool.lookup(repo_name, ref, filename) + if other.morphology['kind'] != wanted: + raise morphlib.Error( + '%s %s references %s:%s:%s which is a %s, ' + 'instead of a %s' % + (src.morphology['kind'], + src.morphology['name'], + repo_name, + ref, + filename, + other.morphology['kind'], + wanted)) + def build_in_order(self, order): '''Build everything specified in a build order.''' self.app.status(msg='Building according to build ordering', -- 1.7.10.4