[tor-commits] [tor-browser-build/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0

[gk at torproject.org]

commit cdb545afe64aa22364f2a7e08e0afe27a1f60129
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Aug 8 16:44:15 2017 +0200

    Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
    
    Thanks to dcf for finding the cause of the problem.
---
 rbm.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rbm.conf b/rbm.conf
index 6745cdc..4efc57c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -274,8 +274,11 @@ gpg_wrapper: |
           SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring';
       END;
   -%]
-  if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \
-      && [ "$2" = '--verify' ]
+  # 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' ] )
   then
         [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /'
         exit ${PIPESTATUS[0]}