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

[SCM] Debian package checker branch, master, updated. 2.2.2-39-g601fbd1



The following commit has been merged in the master branch:
commit ff08ec33c5616cad99c7cd700f60a58e14c284da
Author: Russ Allbery <rra@debian.org>
Date:   Sat Feb 7 19:01:36 2009 -0800

    Fix incorrect path to upstream tarball
    
    Also use File::Spec instead of File::Basename; it works more consistently.

diff --git a/unpack/unpack-srcpkg-l1 b/unpack/unpack-srcpkg-l1
index 898e583..303a5fe 100755
--- a/unpack/unpack-srcpkg-l1
+++ b/unpack/unpack-srcpkg-l1
@@ -34,7 +34,7 @@ my $file = shift;
 use lib "$ENV{'LINTIAN_ROOT'}/lib";
 use Util;
 
-use File::Basename;
+use File::Spec;
 use Lintian::Command qw(spawn);
 
 # stat $file
@@ -57,8 +57,7 @@ for my $field (keys %$data) {
 }
 
 # Install symbolic links to source package files
-my $dir = dirname($file);
-my $name = basename($file);
+my (undef, $dir, $name) = File::Spec->splitpath($file);
 my $tarball;
 my %version;
 
@@ -88,7 +87,7 @@ if (!$tarball) {
 
 # create index file for package
 spawn({ fail => 'error', out => "$base_dir/index" },
-      ["tar", "tfv", $tarball],
+      ["tar", "tfv", "$base_dir/$tarball"],
       '|', ['perl', '-p -w -E', 's,^(([^\s]+\s+){5})[^/]+,$1.,;s,^h,-,'],
       '|', ["sort", "-k", "6"]);
 

-- 
Debian package checker


Reply to: