diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-06-01 10:42:13 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-06-01 10:42:22 +0200 |
| commit | 10e8c0a298b389b9f37f320dbb87df68c4f0454f (patch) | |
| tree | 0e65ee96cf4f0705041ff0f44ea8931db981787b | |
| parent | 18ba984140be5fd03eee95a21796c498391146e6 (diff) | |
| parent | 1983c8772cdd4ba4389f7f9880ec394da73d4a3b (diff) | |
| download | bitcoin-10e8c0a298b389b9f37f320dbb87df68c4f0454f.tar.xz | |
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
| -rwxr-xr-x | contrib/devtools/github-merge.py | 3 |
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) |