This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 7f80a138cb05834fc65ae8ce367d8fa64f1d0fe7 Author: James McCoy <[email protected]> Date: Mon Aug 5 22:13:10 2013 -0400 dscverify: Use ~/.gnupg/trustedkeys.gpg, if available. Closes: #600048 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 1 + scripts/dscverify.1 | 2 ++ scripts/dscverify.pl | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3124bae..4839259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ devscripts (2.13.3) UNRELEASED; urgency=low (Closes: #714835) * uscan/rc-alert: Fix roff errors in man pages. Thanks to Eric S. Raymond for the patch. (Closes: #712701) + * dscverify: Use ~/.gnupg/trustedkeys.gpg, if available. (Closes: #600048) [ Chris Boot ] * bts: Fix no-mutt option. (Closes: #709999) diff --git a/scripts/dscverify.1 b/scripts/dscverify.1 index 3d5e8ce..834d062 100644 --- a/scripts/dscverify.1 +++ b/scripts/dscverify.1 @@ -65,6 +65,8 @@ alias dscverify='dscverify \-\-keyring ~/.gnupg/pubring.gpg' By default dscverify searches for the debian-keyring in the following locations: +- ~/.gnupg/trustedkeys.gpg + - /org/keyring.debian.org/keyrings/debian-keyring.gpg - /usr/share/keyrings/debian-keyring.gpg diff --git a/scripts/dscverify.pl b/scripts/dscverify.pl index 331ba5c..a7be631 100755 --- a/scripts/dscverify.pl +++ b/scripts/dscverify.pl @@ -99,9 +99,12 @@ sub xdie { sub get_rings { my @rings = @_; - my @keyrings = qw(/org/keyring.debian.org/keyrings/debian-keyring.gpg - /usr/share/keyrings/debian-keyring.gpg + my @keyrings = qw(/usr/share/keyrings/debian-keyring.gpg /usr/share/keyrings/debian-maintainers.gpg); + if (defined $ENV{HOME} && -r "$ENV{HOME}/.gnupg/trustedkeys.gpg") { + unshift(@keyrings, "$ENV{HOME}/.gnupg/trustedkeys.gpg"); + } + unshift(@keyrings, '/org/keyring.debian.org/keyrings/debian-keyring.gpg'); if (system('dpkg-vendor', '--derives-from', 'Ubuntu') == 0) { unshift(@keyrings, qw(/usr/share/keyrings/ubuntu-master-keyring.gpg /usr/share/keyrings/ubuntu-archive-keyring.gpg)); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
