From 1983c8772cdd4ba4389f7f9880ec394da73d4a3b Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 31 May 2017 17:18:44 +0200 Subject: [PATCH] devtools: Retry after signing fails in github-merge When signing fails, go back to the sign/exit prompt instead of exiting the script. --- contrib/devtools/github-merge.py | 3 +-- 1 file changed, 1 insertion(+), 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)