diff options
| -rw-r--r-- | gbp/scripts/import_orig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index f473cd7b..c5703579 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -132,7 +132,7 @@ class ImportOrigDebianGitRepository(DebianGitRepository): 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 os.path.exists(os.path.join(self.git_dir, 'MERGE_HEAD')): self.abort_merge() else: raise GitRepositoryError("Don't know how to %s %s %s" % (action, reftype, name)) |