[devscripts] 06/07: who-uploads: Fix extraction of uploader's key id
James McCoy
jamessan at debian.org
Mon Feb 16 04:09:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch master
in repository devscripts.
commit 25fe16500d82cbc536a35b79c8a1e920356b9a26
Author: James McCoy <jamessan at debian.org>
Date: Sun Feb 15 23:00:52 2015 -0500
who-uploads: Fix extraction of uploader's key id
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 2 ++
scripts/who-uploads.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index fbf78c4..790d3ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ devscripts (2.15.1+exp1) UNRELEASED; urgency=medium
* mk-origtargz: Avoid adding the same file to the "to be deleted" list
multiple times. This may also cause patterns to be declared as unused if
a file is matched by multiple patterns. (Closes: #776318)
+ * who-uploads:
+ + Fix extraction of uploader's key id.
[ Johannes Schauer ]
* chdist: Also set Apt::Architectures to prevent foreign architectures from
diff --git a/scripts/who-uploads.sh b/scripts/who-uploads.sh
index 10dbbc4..e851f29 100755
--- a/scripts/who-uploads.sh
+++ b/scripts/who-uploads.sh
@@ -223,7 +223,7 @@ for package; do
fi
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')
+ 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
More information about the devscripts-devel
mailing list