[lintian] 01/01: checks/python.pm: Also ignore -docs.

[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 c67e12b71f16854c0f50de917474453054e8ed7a
Author: Chris Lamb <lamby@debian.org>
Date:   Fri Dec 29 10:49:15 2017 +0000

    checks/python.pm: Also ignore -docs.
---
 checks/python.pm | 10 ++++++----
 debian/changelog |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/checks/python.pm b/checks/python.pm
index 3df0f9d..17dd281 100644
--- a/checks/python.pm
+++ b/checks/python.pm
@@ -54,7 +54,8 @@ sub _run_source {
     my @package_names = $info->binaries;
     foreach my $bin (@package_names) {
         # Python 2 modules
-        if ($bin =~ /^python2?-(.*(?<!-doc)(?<!-common)(?<!-tools))$/) {
+        if ($bin=~ /^python2?-(.*(?<!-doc)(?<!-docs)(?<!-common)(?<!-tools))$/)
+        {
             my $suffix = $1;
             tag 'python-foo-but-no-python3-foo', $bin
               unless any { $_ eq "python3-${suffix}" } @package_names;
@@ -74,7 +75,7 @@ sub _run_source {
     foreach my $regex (keys %MISMATCHED_SUBSTVARS) {
         my $substvar = $MISMATCHED_SUBSTVARS{$regex};
         for my $binpkg ($info->binaries) {
-            next if $binpkg =~ m/-(doc|common|tools)$/;
+            next if $binpkg =~ m/-(docs?|common|tools)$/;
             next if $binpkg !~ qr/$regex/;
             tag 'mismatched-python-substvar', $binpkg, $substvar
               if $info->binary_relation($binpkg, 'all')->implies($substvar);
@@ -114,7 +115,8 @@ sub _run_binary {
           if not $info->relation('strong')->implies($version);
     }
 
-    if ($pkg =~ /^python([23]?)-.*(?<!-doc)(?<!-common)(?<!-tools)$/) {
+    if ($pkg =~ /^python([23]?)-.*(?<!-doc)(?<!-docs)(?<!-common)(?<!-tools)$/)
+    {
         my $version = $1 || '2'; # Assume python-foo is a Python 2.x package
         my @prefixes = ($version eq '2') ? 'python3' : ('python', 'python2');
 
@@ -122,7 +124,7 @@ sub _run_binary {
             for my $prefix (@prefixes) {
                 my $visit = sub {
                     # Depending on python-module-doc, etc. is always fine
-                    return if m/-(doc|common|tools)$/;
+                    return if m/-(docs?|common|tools)$/;
                     #<<< No tidy (tag name too long)
                     tag 'python-package-depends-on-package-from-other-python-variant',
                         "($field: $_)" if m/^$prefix-/;
diff --git a/debian/changelog b/debian/changelog
index 2418928..087afdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,8 @@ lintian (2.5.67) UNRELEASED; urgency=medium
       that depend on Python {3,2} packages when the package being depended
       on ends with -doc. We were previously only catching the case for
       dependencies *from* packages with such names.  (Closes: #885693)
-    + [CL] Also ignore -common and -tools packages for intra-Python variant
-      dependency checking, python-foo-but-no-python3-foo, etc.
+    + [CL] Also ignore -docs, -common, -tools packages for intra-Python
+      variant dependency checking, python-foo-but-no-python3-foo, etc.
   * checks/rules.{desc.pm}:
     + [CL] Suggest using /usr/share/dpkg/architecture.mk as a solution to
       debian-rules-sets-dpkg-architecture-variable rather than simply

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