From: Joey Hess <joey@kitenet.net>
Date: Thu, 26 Sep 2013 19:54:36 +0000 (-0400)
Subject: Merge branch 'master' into dgit/sid
X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=c88fec0bc939c422a1cb44567e7f65418b6edc08;p=gamesguru%2Fgit-remote-gcrypt.git

Merge branch 'master' into dgit/sid

Conflicts:
	git-remote-gcrypt
---

c88fec0bc939c422a1cb44567e7f65418b6edc08
diff --cc git-remote-gcrypt
index 73a6847,87db2a1..22f19dd
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@@ -407,15 -407,21 +407,21 @@@ read_config(
  
  	for recp_ in $conf_part
  	do
- 		filter_to @r_keyinfo "pub*" "$(gpg --with-colons -k "$recp_")"
 -		gpg_list=$(gpg --with-colons --fast-list --fingerprint -k "$recp_")
++		gpg_list=$(gpg --with-colons --fingerprint -k "$recp_")
+ 		filter_to @r_keyinfo "pub*" "$gpg_list"
+ 		filter_to @r_keyfpr "fpr*" "$gpg_list"
  		isnull "$r_keyinfo" || isnonnull "${r_keyinfo##*"$Newline"*}" ||
  		echo_info "WARNING: '$recp_' matches multiple keys, using one"
+ 		isnull "$r_keyfpr" || isnonnull "${r_keyfpr##*"$Newline"*}" ||
+ 		echo_info "WARNING: '$recp_' matches multiple fingerprints, using one"
  		r_keyinfo=${r_keyinfo%%"$Newline"*}
+ 		r_keyfpr=${r_keyfpr%%"$Newline"*}
  		keyid_=$(xfeed "$r_keyinfo" cut -f 5 -d :)
+ 		fprid_=$(xfeed "$r_keyfpr" cut -f 10 -d :)
  
- 		isnonnull "$keyid_" &&
+ 		isnonnull "$fprid_" &&
  		signers_="$signers_ $keyid_" &&
- 		append_to @good_sig "^\[GNUPG:\] GOODSIG $keyid_" || {
+ 		append_to @good_sig "^\[GNUPG:\] VALIDSIG .*$fprid_$" || {
  			echo_info "WARNING: Skipping missing key $recp_"
  			continue
  		}