[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 02/03: checks/watch-file.pm: Use our new $PKGREPACK_REGEX to match and capture the suffix when looking at potential debian/watch mangling issues.



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

lamby pushed a commit to branch master
in repository lintian.

commit 9975b820df9b9aa8c34f382ec594de7b681cb362
Author: Chris Lamb <lamby@debian.org>
Date:   Fri Feb 16 21:44:16 2018 +0000

    checks/watch-file.pm: Use our new $PKGREPACK_REGEX to match and capture the suffix when looking at potential debian/watch mangling issues.
---
 checks/watch-file.pm | 3 ++-
 debian/changelog     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index 98d7f0c..63cc70f 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -26,6 +26,7 @@ use warnings;
 use autodie;
 
 use Lintian::Tags qw(tag);
+use Lintian::Util qw($PKGREPACK_REGEX);
 
 our $WATCH_VERSION = Lintian::Data->new('watch-file/version', qr/\s*=\s*/o);
 our $SIGNING_KEY_FILENAMES= Lintian::Data->new('common/signing-key-filenames');
@@ -49,7 +50,7 @@ sub run {
     # source package sign, for fine grained version mangling check
     # If the version field is missing, we assume a neutral non-native one.
     my $version = $info->field('version', '0-1');
-    if ($version =~ /(dfsg|debian|ds|repack)/) {
+    if ($version =~ $PKGREPACK_REGEX) {
         $repack = $1;
     }
     if ($version =~ /(alpha|beta|rc)/i) {
diff --git a/debian/changelog b/debian/changelog
index 2bfe169..6ba16e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ lintian (2.5.76) UNRELEASED; urgency=medium
       for "override_dh_fixperms-does-not-call-dh_fixperms", etc.
   * checks/scripts.pm:
     + [CL] Prevent some false-positives in udevadm-called-without-guard.
+  * checks/watch-file.pm:
+    + [CL] Use our new $PKGREPACK_REGEX to match and capture the suffix
+      when looking at potential debian/watch mangling issues.
 
   * debian/source/lintian-overrides:
     + [CL] Drop all the overrides for Lintian titself now that we use the

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


Reply to: