diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-04-03 22:57:27 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-04-03 22:57:27 +0200 |
| commit | a983399d50a1e85be781a6d8d8c3a96955405a4e (patch) | |
| tree | 08c64b8c22485d194c792374d2cc6f37ccb7a1c0 /gbp/scripts/import_orig.py | |
| parent | 844e4f8a7599cbadbf2b69613090163f8c5bf232 (diff) | |
repo.git_dir is not a function
Gbp-Dch: Ignore
Diffstat (limited to 'gbp/scripts/import_orig.py')
| -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)) |