diff options
Diffstat (limited to 'gbp/scripts/import_orig.py')
| -rw-r--r-- | gbp/scripts/import_orig.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index c5703579..5df4d7b0 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -131,9 +131,11 @@ class ImportOrigDebianGitRepository(DebianGitRepository): gbp.log.info('Rolling back branch %s by resetting it to %s' % (name, sha)) self.update_ref("refs/heads/%s" % name, sha, msg="gbp import-orig: failure rollback of %s" % name) elif action == 'abortmerge': - gbp.log.info('Rolling back failed merge of %s' % name) - if os.path.exists(os.path.join(self.git_dir, 'MERGE_HEAD')): + if self.is_in_merge(): + gbp.log.info('Rolling back failed merge of %s' % name) self.abort_merge() + else: + gbp.log.info("Nothing to rollback for merge of '%s'" % name) else: raise GitRepositoryError("Don't know how to %s %s %s" % (action, reftype, name)) except GitRepositoryError as e: |