lintian: r378 - in trunk: checks debian unpack

[cjwatson@debian.org]

Author: cjwatson
Date: 2004-12-08 14:09:18 +0100 (Wed, 08 Dec 2004)
New Revision: 378

Modified:
   trunk/checks/deb-format
   trunk/debian/changelog
   trunk/unpack/unpack-binpkg-l1
   trunk/unpack/unpack-binpkg-l2
Log:
Fix binary package data member extraction to work with arbitrary compression
algorithms instead of hardcoding data.tar.gz.


Modified: trunk/checks/deb-format
===================================================================
--- trunk/checks/deb-format	2004-12-06 09:22:18 UTC (rev 377)
+++ trunk/checks/deb-format	2004-12-08 13:09:18 UTC (rev 378)
@@ -38,7 +38,7 @@
 	close LIST;
 }
 
-open INPUT, "ar p deb data.tar.gz | gzip -dc |";
+open INPUT, "dpkg --fsys-tarfile deb |";
 
 my $chunk;
 # Previous was a LongLink?

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-12-06 09:22:18 UTC (rev 377)
+++ trunk/debian/changelog	2004-12-08 13:09:18 UTC (rev 378)
@@ -6,6 +6,9 @@
     + [FL] file has apparently changed its output format for
       symlinks sometime in the past. This broke symlink detection.
       (Closes: #276504)
+  * checks/deb-format, unpack/unpack-binpkg-l1, unpack/unpack-binpkg-l2:
+    + [CW] Fix binary package data member extraction to work with arbitrary
+      compression algorithms instead of hardcoding data.tar.gz.
   * checks/debconf{,.desc}:
     + [FL] The SETTITLE command was introduced in debconf version
       1.3.22. Check the depends for that (Closes: #261890)

Modified: trunk/unpack/unpack-binpkg-l1
===================================================================
--- trunk/unpack/unpack-binpkg-l1	2004-12-06 09:22:18 UTC (rev 377)
+++ trunk/unpack/unpack-binpkg-l1	2004-12-08 13:09:18 UTC (rev 378)
@@ -71,8 +71,8 @@
 
 # (replaces dpkg-deb -c)
 # create index file for package
-pipeline((sub { exec "ar", "p", $file, "data.tar.gz" }),
-	 (sub { exec "tar", "tfvz", "-" }),
+pipeline((sub { exec "dpkg-deb", "--fsys-tarfile", $file }),
+	 (sub { exec "tar", "tfv", "-" }),
 	 (sub { exec "sed", "-e", "s/^h/-/" }),
 	 "$base_dir/index") == 0
     or fail();

Modified: trunk/unpack/unpack-binpkg-l2
===================================================================
--- trunk/unpack/unpack-binpkg-l2	2004-12-06 09:22:18 UTC (rev 377)
+++ trunk/unpack/unpack-binpkg-l2	2004-12-08 13:09:18 UTC (rev 378)
@@ -32,12 +32,12 @@
 print "N: Unpacking binary packages in directory $base_dir ...\n" if $::verbose;
 mkdir("$base_dir/unpacked", 0777) or fail();
 
-# avoid using dpkg-deb; this pipeline is far faster.  I got a factor 2
+# avoid using dpkg-deb -x; this pipeline is far faster.  I got a factor 2
 # improvement on large debs, and factor 1.5 on small debs.  I heard
 # it's because dpkg-deb syncs while writing.  -- Richard
 
-pipeline((sub { exec 'ar', 'p', "$base_dir/deb", 'data.tar.gz' }),
-	 (sub { exec 'tar', 'xfz', '-', '-C', "$base_dir/unpacked" })) == 0
+pipeline((sub { exec 'dpkg', '--fsys-tarfile', "$base_dir/deb" }),
+	 (sub { exec 'tar', 'xf', '-', '-C', "$base_dir/unpacked" })) == 0
     or fail();
 
 # fix permissions