diff options
Diffstat (limited to 'morphlib/plugins/branch_and_merge_new_plugin.py')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 3d0a71a5..9a0ee484 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -434,16 +434,6 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): sb = morphlib.sysbranchdir.open_from_within('.') loader = morphlib.morphloader.MorphologyLoader() - # FIXME: The old "morph edit" code did its own morphology validation, - # which was much laxer than what MorphologyFactory does, or the - # new MorphologyLoader does. This new "morph edit" uses - # MorphologyLoader, and the stricter validation breaks the test - # suite. However, I want to keep the test suite as untouched as - # possible, until all the old code is gone (after which the test - # suite will be refactored). Thus, to work around the test suite - # breaking, we disable morphology validation for now. - loader.validate = lambda *args: None - # Load the system morphology, and all stratum morphologies, including # all the strata that are being build-depended on. @@ -832,7 +822,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): system, metadata = self._load_system_metadata(metadata_path) resolved_refs = dict(self._resolve_refs_from_metadata(alias_resolver, metadata)) - logging.debug('Resolved refs: %r' % resolved_refs) + self.app.status(msg='Resolved refs: %r' % resolved_refs) base_ref = system['sha1'] # The previous version would fall back to deducing this from the repo # url and the repo alias resolver, but this does not always work, and |