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

[SCM] Debian package checker branch, master, updated. 2.2.9-29-g70e1632



The following commit has been merged in the master branch:
commit 70e16320b512a47da0ae6916f10937b5798529e6
Author: Colin Watson <cjwatson@canonical.com>
Date:   Mon Apr 27 16:11:46 2009 +0100

    Allow data.tar.lzma for Ubuntu binaries
    
    * checks/deb-format:
      + [CW] Ubuntu's archive allows packages whose data members are
        compressed with lzma.

diff --git a/checks/deb-format b/checks/deb-format
index ebbcc17..84a840b 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -28,6 +28,14 @@ our %ERRORS = ('control-errors'       => 'tar-errors-from-control',
                'index-errors'         => 'tar-errors-from-data',
                'unpacked-errors'      => 'tar-errors-from-data');
 
+# Used to match Ubuntu distribution names in target distributions.
+our $UBUNTU_REGEX;
+{
+    my $dists = Lintian::Data->new('changelog-file/ubuntu-dists');
+    my $string = join ('|', 'ubuntu', $dists->all);
+    $UBUNTU_REGEX = qr/$string/o;
+}
+
 sub run {
 
 my $pkg = shift;
@@ -51,7 +59,14 @@ if ($success) {
         tag 'malformed-deb-archive',
             "second member $members[1] not control.tar.gz";
     } elsif ($members[2] eq 'data.tar.lzma') {
-        tag 'lzma-deb-archive';
+        # Ubuntu's archive allows lzma packages.
+        my ($entry) = $info->changelog->data;
+        my $distribution = $entry->Distribution;
+        if ($distribution =~ /$UBUNTU_REGEX/) {
+            $okay = 1;
+        } else {
+            tag 'lzma-deb-archive';
+        }
     } elsif ($members[2] !~ /^data\.tar\.(gz|bz2)\z/) {
         tag 'malformed-deb-archive',
             "third member $members[2] not data.tar.(gz|bz2)";
diff --git a/debian/changelog b/debian/changelog
index b34399f..cd502c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ lintian (2.2.10) UNRELEASED; urgency=low
     + [RA] Report tar errors from listing or unpacking the control or data
       members of the package, suppressing uninteresting errors or errors
       that are caught some other way.  (Closes: #367327)
+    + [CW] Ubuntu's archive allows packages whose data members are
+      compressed with lzma.
   * checks/fields{,.desc}:
     + [RA] Remove package-uses-breaks.  dpkg in stable now supports it.
       Thanks, Julian Andres Klode.  (Closes: #522660)

-- 
Debian package checker


Reply to: