diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-07 12:16:49 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-07 12:35:37 +0000 |
| commit | 8cf3add90b3eb28778e1d62cec77e72e16609414 (patch) | |
| tree | 6988a3639111fe3bdfcf0d92c5094d0c55e12fe3 | |
| parent | 356e5f60268b154a5aa09b4fbcd716d908262b56 (diff) | |
| download | morph-8cf3add90b3eb28778e1d62cec77e72e16609414.tar.gz | |
Raise correct error on `morph checkout|branch` of repo with no morphs
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 94b2381c..8c8a98e9 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -191,7 +191,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): ws, root_url, system_branch, cached_repo, base_ref) as (sb, gd): if not self._checkout_has_systems(gd): - raise BranchRootHasNoSystemsError(base_ref) + raise BranchRootHasNoSystemsError(root_url, base_ref) def branch(self, args): @@ -252,7 +252,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): gd.checkout(system_branch) if not self._checkout_has_systems(gd): - raise BranchRootHasNoSystemsError(base_ref) + raise BranchRootHasNoSystemsError(root_url, base_ref) def _save_dirty_morphologies(self, loader, sb, morphs): logging.debug('Saving dirty morphologies: start') |