summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-11-08 10:44:54 +0100
committerJim Meyering <meyering@redhat.com>2011-11-08 10:45:42 +0100
commit103bb35a244bc08ec657bac05a0a1d429d651f45 (patch)
tree074d81deb1c6ccd18d3538829476f0e406e3cb2a
parentaf22ec80f389dff47bacea72e8c88431ab02f59b (diff)
downloadgnulib-103bb35a244bc08ec657bac05a0a1d429d651f45.tar.gz
maint.mk: extract GPG key ID without using a temporary file
* top/maint.mk (gpg_key_ID): Extract GPG key ID from signed tag, but without using a temporary file. Based on a suggestion from Werner Koch in http://thread.gmane.org/gmane.comp.encryption.gpg.devel/16496
-rw-r--r--ChangeLog7
-rw-r--r--top/maint.mk6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1761f56804..6efe313c6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-07 Jim Meyering <meyering@redhat.com>
+
+ maint.mk: extract GPG key ID without using a temporary file
+ * top/maint.mk (gpg_key_ID): Extract GPG key ID from signed tag, but
+ without using a temporary file. Based on a suggestion from Werner Koch
+ in http://thread.gmane.org/gmane.comp.encryption.gpg.devel/16496
+
2011-11-07 Eric Blake <eblake@redhat.com>
grantpt: fix typo
diff --git a/top/maint.mk b/top/maint.mk
index 405c6d0930..d2f5830c7f 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1203,9 +1203,9 @@ bootstrap-tools ?= autoconf,automake,gnulib
# If it's not already specified, derive the GPG key ID from
# the signed tag we've just applied to mark this release.
gpg_key_ID ?= \
- $$(git cat-file tag v$(VERSION) > .ann-sig \
- && gpgv .ann-sig - < /dev/null 2>&1 \
- | sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig)
+ $$(git cat-file tag v$(VERSION) \
+ | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
+ | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q}')
translation_project_ ?= coordinator@translationproject.org