LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

devtools: Retry after signing fails in github-merge

Browse source 
When signing fails, go back to the sign/exit prompt instead
of exiting the script.
This commit is contained in:
Wladimir J. van der Laan 2017-05-31 17:18:44 +02:00
parent 5dd69ce551
commit 1983c8772c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/devtools/github-merge.py
View file

@ -301,8 +301,7 @@ def main():
subprocess.check_call([GIT,'commit','-q','--gpg-sign','--amend','--no-edit']) subprocess.check_call([GIT,'commit','-q','--gpg-sign','--amend','--no-edit'])
break break
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print("Error signing, exiting.",file=stderr) print("Error while signing, asking again.",file=stderr)
exit(1)
elif reply == 'x': elif reply == 'x':
print("Not signing off on merge, exiting.",file=stderr) print("Not signing off on merge, exiting.",file=stderr)
exit(1) exit(1)