commit 6b1c63cc05cd28a55a241296808eef448bdf96f3 Author: Nicolas Vigier boklm@torproject.org Date: Tue Aug 8 17:08:13 2017 +0200

Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0

Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^[GNUPG:] EXPKEYSIG /[GNUPG:] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^[GNUPG:] EXPKEYSIG /[GNUPG:] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi