Merge #10486: devtools: Retry after signing fails in github-merge
1983c87
devtools: Retry after signing fails in github-merge (Wladimir J. van der Laan)
Tree-SHA512: f5ef91c93f4e53c9b234e7dc3ac398c6715144021d92c8592174d02c672ae99d27e88faefd52239c2a74c8e49cfd3a979e0229580016ce9a74829bdb0af206ec
This commit is contained in:
commit
10e8c0a298
1 changed files with 1 additions and 2 deletions
|
@ -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…
Reference in a new issue