[devscripts] 01/01: who-uploads: Fix search for user IDs with gpg2 and no @debian.org user IDs

[Paul Wise]

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

pabs pushed a commit to branch master
in repository devscripts.

commit 2ea87211bed2989e966e3f24d6b6025e99c16acc
Author: Paul Wise <pabs at debian.org>
Date:   Sun Oct 30 15:54:30 2016 +0800

    who-uploads: Fix search for user IDs with gpg2 and no @debian.org user IDs
    
    Reported-by: Julien Puydt (Snark) <julien.puydt at laposte.net>
    Reported-in: #debian-mentors
---
 debian/changelog       | 4 ++++
 scripts/who-uploads.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3c4870..812c6c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ devscripts (2.16.9) UNRELEASED; urgency=medium
     + Use dpkg-buildpackage instead of ad-hoc code
     + Compare .changes files and fallback to use debdiff
 
+  [ Paul Wise ]
+  * who-uploads:
+    + Fix search for user IDs with gpg2 and no @debian.org user IDs
+
  -- James McCoy <jamessan at debian.org>  Sat, 01 Oct 2016 13:26:57 -0400
 
 devscripts (2.16.8) unstable; urgency=medium
diff --git a/scripts/who-uploads.sh b/scripts/who-uploads.sh
index 14618b5..3e7d113 100755
--- a/scripts/who-uploads.sh
+++ b/scripts/who-uploads.sh
@@ -241,8 +241,8 @@ for package; do
 
 	UPLOADER=$($GPG $GPG_OPTIONS \
 	           "${GPG_DEFAULT_KEYRINGS[@]}" "${GPG_KEYRINGS[@]}" \
-	           --list-key --with-colons $GPG_ID 2>/dev/null |
-	           awk  -F: '/@debian\.org>/ { a = $10; exit} /^pub/ { a = $10 } END { print a }' )
+	           --list-key --with-colons --fixed-list-mode $GPG_ID 2>/dev/null |
+	           awk  -F: '/@debian\.org>/ { a = $10; exit} /^uid/ { a = $10; exit} END { print a }' )
 	if [ -z "$UPLOADER" ]; then UPLOADER="<unrecognised public key ($GPG_ID)>"; fi
 
 	output="$VERSION to $DISTRO: $UPLOADER"

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