Browse Source

devtools: Retry after signing fails in github-merge

When signing fails, go back to the sign/exit prompt instead
of exiting the script.
0.15
Wladimir J. van der Laan 8 years ago
parent
commit
1983c8772c
  1. 3
      contrib/devtools/github-merge.py

3
contrib/devtools/github-merge.py

@ -301,8 +301,7 @@ def main(): @@ -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)

Loading…
Cancel
Save