[devscripts] 03/03: who-uploads: Use long keyid format to avoid ambiguity

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 18b3f8e9a97466c2f05cb63e0cb847fbebd1ac39
Author: James McCoy <jamessan at debian.org>
Date:   Wed Dec 4 21:47:24 2013 -0500

    who-uploads: Use long keyid format to avoid ambiguity
    
    Closes: #674579
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog       | 1 +
 scripts/who-uploads.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d2b27e..9431222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ devscripts (2.13.5) UNRELEASED; urgency=low
     + Fix a test failure in test_uscan_online due to different version format.
   * rc-alert: Be more flexible in the formatting of the HTML being parsed.
     (Closes: #729779)
+  * who-uploads: Use long keyid format to avoid ambiguity.  (Closes: #674579)
 
   [ Evgeni Golov ]
   * debcheckout: allow setting the user for auth mode in the config.  (Closes:
diff --git a/scripts/who-uploads.sh b/scripts/who-uploads.sh
index 5955ae3..79dd558 100755
--- a/scripts/who-uploads.sh
+++ b/scripts/who-uploads.sh
@@ -222,8 +222,8 @@ for package; do
 	    DATE=$(echo "$HTML_TEXT" |  sed -ne 's%<li><em>Date</em>: \(.*\)</li>%\1%p')
 	fi
 
-	GPG_ID=$(echo "$GPG_TEXT" | LC_ALL=C gpg $GPG_NO_KEYRING --verify 2>&1 |
-	         sed -rne 's/.*ID ([0-9A-Z]+).*/\1/p')
+	GPG_ID=$(echo "$GPG_TEXT" | LC_ALL=C gpg $GPG_NO_KEYRING --keyid-format long --verify 2>&1 |
+	         sed -rne 's/using [^ ]* key ([0-9A-Z]+).*/\1/p')
 
 	UPLOADER=$(gpg $GPG_OPTIONS \
 	           "${GPG_DEFAULT_KEYRINGS[@]}" "${GPG_KEYRINGS[@]}" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git