[lintian] 02/02: checks/watch-file.pm: Include the name of the upstream signature file.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit f23828c148a17c43a4f7cba85a43fcb7aaa16e21
Author: Chris Lamb <lamby@debian.org>
Date: Thu Dec 28 17:24:54 2017 +0000
checks/watch-file.pm: Include the name of the upstream signature file.
---
checks/watch-file.pm | 4 ++--
t/tests/watch-file-general/tags | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index 868f35f..b4aead3 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -190,7 +190,7 @@ sub run {
for my $key_name ($SIGNING_KEY_FILENAMES->all) {
my $path = $info->index_resolved_path("debian/$key_name");
if ($path and $path->is_file) {
- $key_found = 1;
+ $key_found = $path;
last;
}
}
@@ -200,7 +200,7 @@ sub run {
tag 'debian-watch-file-pubkey-file-is-missing' unless $key_found;
} else {
# Check upstream key is used if present
- tag 'debian-watch-could-verify-download' if $key_found;
+ tag 'debian-watch-could-verify-download', $key_found if $key_found;
}
my $changes = $info->changelog;
diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags
index 44ba5fd..91864a4 100644
--- a/t/tests/watch-file-general/tags
+++ b/t/tests/watch-file-general/tags
@@ -2,7 +2,7 @@ E: watch-file-general source: debian-watch-file-uses-deprecated-githubredir line
I: watch-file-general source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5
I: watch-file-general source: debian-watch-uses-insecure-uri http://insecure.com
P: watch-file-general source: debian-watch-may-check-gpg-signature
-W: watch-file-general source: debian-watch-could-verify-download
+W: watch-file-general source: debian-watch-could-verify-download debian/upstream/signing-key.asc
W: watch-file-general source: debian-watch-file-declares-multiple-versions line 18
W: watch-file-general source: debian-watch-file-declares-multiple-versions line 7
W: watch-file-general source: debian-watch-file-should-mangle-version line 12
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: