[SCM] Debian package checker branch, master, updated. 2.2.5-38-gcc59976
The following commit has been merged in the master branch:
commit 66d3dde24967b1f2d68fe2aaab2c4a268a9d7b00
Author: Russ Allbery <rra@debian.org>
Date: Sat Feb 21 14:34:29 2009 -0800
Support LZMA-compressed upstream source
* unpack/unpack-srcpkg-l1:
+ [RA] Support LZMA-compressed upstream source. (Closes: #515068)
diff --git a/debian/changelog b/debian/changelog
index cbf54df..b0535c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ lintian (2.2.6) UNRELEASED; urgency=low
* unpack/unpack-srcpkg-l1:
+ [ADB] Handle a number of different ways in which upstream directory
trees may be represented in tarballs. (Closes: #515795)
+ + [RA] Support LZMA-compressed upstream source. (Closes: #515068)
-- Russ Allbery <rra@debian.org> Fri, 13 Feb 2009 15:48:50 -0800
diff --git a/unpack/unpack-srcpkg-l1 b/unpack/unpack-srcpkg-l1
index 324e787..fdcf9a6 100755
--- a/unpack/unpack-srcpkg-l1
+++ b/unpack/unpack-srcpkg-l1
@@ -6,17 +6,18 @@
# Note, that <dsc-file> must be specified with absolute path.
# Copyright (C) 1998 Christian Schwarz
-#
+# Copyright (C) 2009 Raphael Geissert
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, you can find it on the World Wide
# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
@@ -82,10 +83,14 @@ for my $fs (split(/\n/,$data->{'files'})) {
if (!$tarball) {
fail("could not find the source tarball");
}
+my @tar_options = ('-tvf');
+if ($tarball =~ /\.lzma\z/) {
+ unshift(@tar_options, '--lzma');
+}
# create index file for package
spawn({ fail => 'error', out => "$base_dir/index" },
- ["tar", "tfv", "$base_dir/$tarball"],
+ ["tar", @tar_options, "$base_dir/$tarball"],
'|', ['perl', '-p -w -E', 's,^(\S+\s+){5}\./$,,;',
'-E', 's,^((\S+\s+){5})(\./)?[^/]+,$1.,;s,^h,-,'],
'|', ['awk', '/^.+$/ {print $0}'],
--
Debian package checker
Reply to: