diff options
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 9a0ee484..dba529d9 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -134,6 +134,9 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): gd.update_submodules(self.app) gd.update_remotes() + except morphlib.sysbranchdir.SystemBranchDirectoryAlreadyExists as e: + logging.error('Caught exception: %s' % str(e)) + raise except BaseException as e: # Oops. Clean up. logging.error('Caught exception: %s' % str(e)) |