aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.py
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-05-31 17:18:44 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-05-31 17:18:44 +0200
commit1983c8772cdd4ba4389f7f9880ec394da73d4a3b (patch)
tree11e1b2fe8b69482667559b90ffee067b0d82b1ab /contrib/devtools/github-merge.py
parent5dd69ce55109ee964f46b392a3a0cc39979f1f59 (diff)
devtools: Retry after signing fails in github-merge
When signing fails, go back to the sign/exit prompt instead of exiting the script.
Diffstat (limited to 'contrib/devtools/github-merge.py')
-rwxr-xr-xcontrib/devtools/github-merge.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index 8fce648fc2..e9816f7d19 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -301,8 +301,7 @@ def main():
subprocess.check_call([GIT,'commit','-q','--gpg-sign','--amend','--no-edit'])
break
except subprocess.CalledProcessError as e:
- print("Error signing, exiting.",file=stderr)
- exit(1)
+ print("Error while signing, asking again.",file=stderr)
elif reply == 'x':
print("Not signing off on merge, exiting.",file=stderr)
exit(1)