[lintian] 01/01: Also ignore -common packages for intra-Python variant dependency checking.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 5b8b94cee46729f737929aeffb3d8b810f6236a1
Author: Chris Lamb <lamby@debian.org>
Date: Fri Dec 29 09:22:13 2017 +0000
Also ignore -common packages for intra-Python variant dependency checking.
---
checks/python.pm | 6 +++---
debian/changelog | 2 ++
.../debian/debian/control.in | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/checks/python.pm b/checks/python.pm
index 9de771b..0c7ac6e 100644
--- a/checks/python.pm
+++ b/checks/python.pm
@@ -113,15 +113,15 @@ sub _run_binary {
if not $info->relation('strong')->implies($version);
}
- if ($pkg =~ /^python([23]?)-.*(?<!-doc)$/) {
+ if ($pkg =~ /^python([23]?)-.*(?<!-doc)(?<!-common)$/) {
my $version = $1 || '2'; # Assume python-foo is a Python 2.x package
my @prefixes = ($version eq '2') ? 'python3' : ('python', 'python2');
for my $field (@FIELDS) {
for my $prefix (@prefixes) {
my $visit = sub {
- # Depending on python-module-doc is always fine
- return if m/-doc$/;
+ # Depending on python-module-doc, etc. is always fine
+ return if m/-(doc|common)$/;
#<<< 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 608718a..f820610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +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 packages for intra-Python variant dependency
+ checking.
* checks/watch-file.{desc,pm}:
+ [CL] Apply patch from Felix Lechner <felix.lechner@lease-up.com> to
check for packages where an upstream signature exists but is not
diff --git a/t/tests/python-package-depends-on-package-from-other-python-variant/debian/debian/control.in b/t/tests/python-package-depends-on-package-from-other-python-variant/debian/debian/control.in
index 5df6ff1..598359d 100644
--- a/t/tests/python-package-depends-on-package-from-other-python-variant/debian/debian/control.in
+++ b/t/tests/python-package-depends-on-package-from-other-python-variant/debian/debian/control.in
@@ -28,7 +28,7 @@ Description: Python 2 package depending on python3-foo (explicit)
Package: python3-foo
Architecture: all
-Depends: $\{misc:Depends\}, python3, python-foo, python2-foo, python2-bar, python3-falsepositive, python-foo-doc
+Depends: $\{misc:Depends\}, python3, python-foo, python2-foo, python2-bar, python3-falsepositive, python-foo-doc, python-foo-common
Description: Python 3 package depending on python-foo and python2-foo
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: