diff options
| author | Dan Firth <dan.firth@codethink.co.uk> | 2013-10-01 12:56:21 +0000 |
|---|---|---|
| committer | Dan Firth <dan.firth@codethink.co.uk> | 2013-10-01 12:56:21 +0000 |
| commit | f4aaea23b7d80084504832d6b967a50c2d501b9e (patch) | |
| tree | 9e49e64dd506b7856fb77ea0e07c542f52cf0de6 | |
| parent | 091809507fca909cd7c1a37ce6dbd553a973da09 (diff) | |
| download | morph-f4aaea23b7d80084504832d6b967a50c2d501b9e.tar.gz | |
Re-enabled validation for morph edit
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 39552ef0..621bf907 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -417,16 +417,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. |