This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 7c390ad3dbd6075ec43e2b6f7fe42a858c561dc6 Author: Chris Lamb <[email protected]> Date: Fri Dec 29 10:51:49 2017 +0000 Also -dev packages for intra-Python variant dependency checking, python-but-no-python3, etc. --- checks/python.pm | 8 ++++---- debian/changelog | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/python.pm b/checks/python.pm index 4ca92b3..ec8a40b 100644 --- a/checks/python.pm +++ b/checks/python.pm @@ -54,7 +54,7 @@ sub _run_source { my @package_names = $info->binaries; foreach my $bin (@package_names) { # Python 2 modules - if ($bin=~ /^python2?-(.*(?<!-doc)(?<!-docs)(?<!-common)(?<!-tools))$/) + if ($bin=~ /^python2?-(.*(?<!-dev)(?<!-doc)(?<!-docs)(?<!-common)(?<!-tools))$/) { my $suffix = $1; tag 'python-foo-but-no-python3-foo', $bin @@ -75,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/-(docs?|common|tools)$/; + next if $binpkg =~ m/-(dev|docs?|common|tools)$/; next if $binpkg !~ qr/$regex/; tag 'mismatched-python-substvar', $binpkg, $substvar if $info->binary_relation($binpkg, 'all')->implies($substvar); @@ -115,7 +115,7 @@ sub _run_binary { if not $info->relation('strong')->implies($version); } - if ($pkg =~ /^python([23]?)-.*(?<!-doc)(?<!-docs)(?<!-common)(?<!-tools)$/) + if ($pkg =~ /^python([23]?)-.*(?<!-dev)(?<!-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'); @@ -124,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/-(docs?|common|tools)$/; + return if m/-(dev|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 4a7c394..ea18eda 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 -docs, -common, -tools packages for intra-Python - variant dependency checking, python-foo-but-no-python3-foo, etc. + + [CL] Also ignore -doc, -docs, -dev, -common and -tools packages for + intra-Python variant dependency checking, python-but-no-python3, etc. + [CL] Drop parens in depends-on-package-from-other-python-variant output. * checks/rules.{desc.pm}: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
