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

[SCM] Debian package checker branch, master, updated. 2.2.5-22-g064a5d4



The following commit has been merged in the master branch:
commit 064a5d4fc22252e1b35744113bcc61330afaf419
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Tue Feb 17 21:08:10 2009 +0000

    Handle a number of different formats for upstream tarball directories
    
    Don't assume that tarballs will always contain "foo/, "foo/a", etc.
    Some are "./foo", some also contain "./".
    
    * unpack/unpack-srcpkg-l1:
      + [ADB] Handle a number of different ways in which upstream directory
        trees may be represented in tarballs.  (Closes: #515795)

diff --git a/debian/changelog b/debian/changelog
index 59d5282..ef2720c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,10 @@ lintian (2.2.6) UNRELEASED; urgency=low
     + [RA] Minor optimizations to {read,parse}_dpkg_control.  Patch from
       Raphael Geissert.
 
+  * unpack/unpack-srcpkg-l1:
+    + [ADB] Handle a number of different ways in which upstream directory
+      trees may be represented in tarballs.  (Closes: #515795)
+
  -- Russ Allbery <rra@debian.org>  Fri, 13 Feb 2009 15:48:50 -0800
 
 lintian (2.2.5) unstable; urgency=low
diff --git a/unpack/unpack-srcpkg-l1 b/unpack/unpack-srcpkg-l1
index d20adeb..324e787 100755
--- a/unpack/unpack-srcpkg-l1
+++ b/unpack/unpack-srcpkg-l1
@@ -86,7 +86,9 @@ if (!$tarball) {
 # create index file for package
 spawn({ fail => 'error', out => "$base_dir/index" },
       ["tar", "tfv", "$base_dir/$tarball"],
-      '|', ['perl', '-p -w -E', 's,^(([^\s]+\s+){5})[^/]+,$1.,;s,^h,-,'],
+      '|', ['perl', '-p -w -E', 's,^(\S+\s+){5}\./$,,;',
+		'-E', 's,^((\S+\s+){5})(\./)?[^/]+,$1.,;s,^h,-,'],
+      '|', ['awk', '/^.+$/ {print $0}'],
       '|', ["sort", "-k", "6"]);
 
 # Create symbolic links to binary packages

-- 
Debian package checker


Reply to: