commit e47bc3b70e798a10906c25d8d38fae09e1a1657f Author: Nicolas Vigier <boklm@torproject.org> Date: Thu Apr 11 12:07:26 2019 +0200 Bug 30128: Fix git-gpg-wrapper with recent versions of gpg --- rbm.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rbm.conf b/rbm.conf index ff53153..89f6eaf 100644 --- a/rbm.conf +++ b/rbm.conf @@ -364,11 +364,12 @@ gpg_wrapper: | SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; END; -%] - # git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 - if ( [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ - && [ "$2" = '--verify' ] ) \ - || ( [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ - && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] ) + gpg_verify=0 + for opt in "$@" + do + test "$opt" = '--verify' && gpg_verify=1 + done + if [ $gpg_verify = 1 ] then [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]}