[lintian] 01/02: checks/watch-file.pm: Tidy up previous commit.

[Chris Lamb <chris@chris-lamb.co.uk>]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 7e5f55420c56a3972bf83d3ae2618443382b2715
Author: Chris Lamb <lamby@debian.org>
Date:   Thu Dec 28 17:24:25 2017 +0000

    checks/watch-file.pm: Tidy up previous commit.
---
 checks/watch-file.desc |  8 +++++---
 checks/watch-file.pm   | 15 +++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index b9bd3a2..9677507 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -185,9 +185,11 @@ Tag: debian-watch-could-verify-download
 Severity: normal
 Certainty: certain
 Ref: uscan(1)
-Info: One or more upstream signing keys are present but are not being
- used.  Please enable the cryptographic verification of downloads with
- the option 'pgpsigurlmangle' in your watch file or get rid of the key.
+Info: One or more upstream signing keys are present in the Debian package
+ but are not being used.
+ .
+ Please enable the cryptographic verification of downloads with the
+ "pgpsigurlmangle" option in your watch file or remove the key.
 
 Tag: debian-watch-contains-dh_make-template
 Severity: wishlist
diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index dae94b1..868f35f 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -195,17 +195,12 @@ sub run {
         }
     }
 
-    # Check upstream key is present if needed
     if ($withgpgverification) {
-        if (not $key_found) {
-            tag 'debian-watch-file-pubkey-file-is-missing';
-        }
-    }
-    # Check upstream key is used if present
-    else {
-        if ($key_found) {
-            tag 'debian-watch-could-verify-download';
-        }
+        # Check upstream key is present if needed
+        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;
     }
 
     my $changes = $info->changelog;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git