[lintian] 01/02: Factor out hard-coded list of possible upstream key locations to the "common/signing-key-filenames" Lintian::Data resource.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch lamby/wip/upstream-signing-833585
in repository lintian.
commit 947e2278715944eee4362105c74eae793eea0a9f
Author: Chris Lamb <lamby@debian.org>
Date: Sat Jul 15 20:31:55 2017 +0100
Factor out hard-coded list of possible upstream key locations to the "common/signing-key-filenames" Lintian::Data resource.
---
checks/watch-file.pm | 7 ++-----
data/common/signing-key-filenames | 5 +++++
debian/changelog | 3 +++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index bfa5d92..ca651f0 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -28,6 +28,7 @@ use autodie;
use Lintian::Tags qw(tag);
our $WATCH_VERSION = Lintian::Data->new('watch-file/version', qr/\s*=\s*/o);
+our $SIGNING_KEY_FILENAMES = Lintian::Data->new('common/signing-key-filenames');
sub run {
my (undef, undef, $info) = @_;
@@ -185,12 +186,8 @@ sub run {
tag 'debian-watch-may-check-gpg-signature' unless ($withgpgverification);
if ($withgpgverification) {
- my @key_names = (
- qw(upstream-signing-key.pgp upstream/signing-key.pgp
- upstream/signing-key.asc)
- );
my $found = 0;
- for my $key_name (@key_names) {
+ for my $key_name ($SIGNING_KEY_FILENAMES->all) {
my $path = $info->index_resolved_path("debian/$key_name");
if ($path and $path->is_file) {
$found = 1;
diff --git a/data/common/signing-key-filenames b/data/common/signing-key-filenames
new file mode 100644
index 0000000..f358063
--- /dev/null
+++ b/data/common/signing-key-filenames
@@ -0,0 +1,5 @@
+# Manually maintained list of possible upstream signing key locations
+#
+upstream-signing-key.pgp
+upstram/signing-key.pgp
+upstream/signing-key.asc
diff --git a/debian/changelog b/debian/changelog
index 1a24833..a252b91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,9 @@ lintian (2.5.52) UNRELEASED; urgency=medium
DH_BUILD_MAINT_OPTIONS. (Closes: #833691)
* checks/udev.{desc,pm}:
+ [NT] New check by Petter Reinholdtsen.
+ * checks/watch-file.pm:
+ + [CL] Factor out hard-coded list of possible upstream key locations
+ to the "common/signing-key-filenames" Lintian::Data resource.
* commands/lintian.pm:
+ [NT] Attempt to clean up on SIGTERM (like with SIGINT).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: