diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-10-13 23:02:07 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2009-10-13 23:03:32 +0200 |
| commit | ee3209c5838f852e5312596a592602db0525eb62 (patch) | |
| tree | 5b96488ca1299fd27662c56afc5ed1a292e1fc09 | |
| parent | 7507e7aceefd6c239735b162351a8ed1123b500b (diff) | |
Drop superflous argument
fixes TypeError on merge failures.
Closes: #549885
| -rwxr-xr-x | git-import-orig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-import-orig b/git-import-orig index a8e4d3c9..dc8d7e2c 100755 --- a/git-import-orig +++ b/git-import-orig @@ -382,7 +382,7 @@ on howto create it otherwise use --upstream-branch to specify it. try: gbpc.GitMerge(tag)() except gbpc.CommandExecFailed: - raise GbpError, """Merge failed, please resolve.""" % version + raise GbpError, """Merge failed, please resolve.""" if options.postimport: epoch = '' if os.access('debian/changelog', os.R_OK): |