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

[SCM] Debian package checker branch, master, updated. 2.4.3-205-g7267d71



The following commit has been merged in the master branch:
commit 7267d71d0365d2f9423677db65f7e64c7c8392d1
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jan 29 22:14:53 2011 +0100

    Check for missing depends on python-support (#592491)
    
      * Summary of tag changes:
        + Added:
          - missing-dependency-on-python-support
      * checks/files{,.desc}:
        + [NT] Added check for missing dependency on python-support.
          Thanks to Jakub Wilk for the report.  (Closes: #592491)

diff --git a/checks/files b/checks/files
index 7d5ba38..39943ea 100644
--- a/checks/files
+++ b/checks/files
@@ -153,6 +153,8 @@ my @nonbinary_perl_files_in_lib;
 
 my %linked_against_libvga;
 
+my $py_support_nver = undef;
+
 # read data from objdump-info file
 foreach my $file (sort keys %{$info->objdump_info}) {
     my $objdump = $info->objdump_info->{$file};
@@ -812,6 +814,12 @@ foreach my $file (@{$info->sorted_index}) {
 	tag 'missing-dependency-on-python-central' unless ($dep->implies('python-central (>= 0.6)'));
     }
 
+    if ($file =~ m,^usr/share/python-support/$tmp\.(?:public|private)$,){
+	$py_support_nver = '(>= 0.90)';
+    } elsif ($file =~ m,^usr/share/python-support/\S+,o && !$py_support_nver){
+	$py_support_nver = '';
+    }
+
     # ---------------- python file locations
     #  - The python people kindly provided the following table.
     # good:
@@ -1242,6 +1250,20 @@ foreach my $file (@{$info->sorted_index}) {
     }
 }
 
+# python-support check
+if (defined($py_support_nver) && $pkg ne 'python-support'){
+    # Okay - package installs something to /usr/share/python-support/
+    # $py_support_nver is either the empty string or a version
+    # describing what we need.
+    #
+    # We also skip debug packages since they are okay as long as
+    # foo-dbg depends on foo (= $version) and foo has its dependency
+    # correct.
+    my $dep = Lintian::Relation->new($info->field('depends')//'');
+    tag 'missing-dependency-on-python-support', "python-support $py_support_nver"
+	unless ($pkg =~ m/-dbg$/ || $dep->implies("python-support $py_support_nver"));
+}
+
 # Check for section games but nothing in /usr/games.  Check for any binary to
 # save ourselves from game-data false positives:
 my $games = dir_counts($info, 'usr/games/');
diff --git a/checks/files.desc b/checks/files.desc
index cb8ee00..6cb0921 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -770,6 +770,15 @@ Info: The package installs a file with the package name in
  This can happen if ${python:Depends} was omitted from the Depends field
  in debian/control.
 
+Tag: missing-dependency-on-python-support
+Severity: important
+Certainty: possible
+Info: The package installs a file in usr/share/python-support/ but does
+ not declare the necessary dependency on python-support.
+ .
+ This can happen if ${python:Depends} was omitted from the Depends field
+ in debian/control.
+
 Tag: package-installs-python-pyc
 Severity: serious
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index d2d63c3..4c1ad3a 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ lintian (2.5.0) UNRELEASED; urgency=low
       - debian-watch-contains-dh_make-template
       - missing-dependency-on-python-central
       - python-module-in-wrong-location
+      - missing-dependency-on-python-support
     + Removed:
       - embedded-zlib (now in embedded-library)
       - embedded-libpng (now in embedded-library)
@@ -94,6 +95,8 @@ lintian (2.5.0) UNRELEASED; urgency=low
     + [NT] Removed the "!= 0755" part from the out of the tag
       executable-is-not-world-readable, since there are other valid
       world readable file permissions.
+    + [NT] Added check for missing dependency on python-support.
+      Thanks to Jakub Wilk for the report.  (Closes: #592491)
   * checks/menu-format.desc:
     + [CW] Fix several typos.
   * checks/menus.desc:
diff --git a/t/tests/files-python-helpers/debian/debian/install b/t/tests/files-python-helpers/debian/debian/install
index c2d69f8..32f8901 100644
--- a/t/tests/files-python-helpers/debian/debian/install
+++ b/t/tests/files-python-helpers/debian/debian/install
@@ -1 +1,3 @@
 python-foo usr/share/pyshared-data/
+python-foo usr/share/python-support/
+python-foo.private usr/share/python-support/
diff --git a/t/tests/changelog-file-missing/upstream/README b/t/tests/files-python-helpers/debian/python-foo.private
similarity index 100%
copy from t/tests/changelog-file-missing/upstream/README
copy to t/tests/files-python-helpers/debian/python-foo.private
diff --git a/t/tests/files-python-helpers/desc b/t/tests/files-python-helpers/desc
index 722e78b..abb965b 100644
--- a/t/tests/files-python-helpers/desc
+++ b/t/tests/files-python-helpers/desc
@@ -4,3 +4,4 @@ Version: 1.0
 Description: Test tags for missing depends on python helpers
 Test-For:
  missing-dependency-on-python-central
+ missing-dependency-on-python-support
diff --git a/t/tests/files-python-helpers/tags b/t/tests/files-python-helpers/tags
index e30598d..75a38e2 100644
--- a/t/tests/files-python-helpers/tags
+++ b/t/tests/files-python-helpers/tags
@@ -1 +1,2 @@
 E: python-foo: missing-dependency-on-python-central
+E: python-foo: missing-dependency-on-python-support python-support (>= 0.90)

-- 
Debian package checker


Reply to: