diff options
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index dba529d9..9c4cd53e 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -443,6 +443,8 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): logging.debug('Loading system morphology') system_morph = loader.load_from_file( sb.get_filename(sb.root_repository_url, system_name + '.morph')) + if system_morph['kind'] != 'system': + raise cliapp.AppException("%s is not a system" % system_name) system_morph.repo_url = sb.root_repository_url system_morph.ref = sb.system_branch_name system_morph.filename = system_name + '.morph' |