The following commit has been merged in the master branch:
commit f2e3cf6c07fda1da156374fcb7897cc93a096e34
Author: Christian Kastner <[email protected]>
Date: Fri May 27 00:21:18 2011 +0200
Fix --destdir regression when repacking ZIP files
The --destdir option no longer worked with relative paths because we cd
before
archiving. This patch uses an absolute path when creating the archive.
Signed-off-by: James Vega <[email protected]>
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index d760281..c1599d3 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -24,6 +24,7 @@
use 5.008; # uses 'our' variables and filetest
use strict;
use Cwd;
+use Cwd 'abs_path';
use File::Basename;
use File::Copy;
use File::Temp qw/tempdir/;
@@ -1374,12 +1375,13 @@ EOF
my $tempdir = tempdir ( "uscanXXXX", TMPDIR => 1, CLEANUP => 1 );
my $globpattern = "*";
my $hidden = ".[!.]*";
+ my $absdestdir = abs_path($destdir);
system("unzip -q -a -d $tempdir $destdir/$newfile_base") == 0
or die("Repacking from zip to tar.gz failed (could not unzip)\n");
if (defined glob("$tempdir/$hidden")) {
$globpattern .= " $hidden";
}
- system("cd $tempdir; GZIP=-9 tar --owner=root --group=root --mode=a+rX
-czf $destdir/$newfile_base_gz $globpattern") == 0
+ system("cd $tempdir; GZIP=-9 tar --owner=root --group=root --mode=a+rX
-czf $absdestdir/$newfile_base_gz $globpattern") == 0
or die("Repacking from zip to tar.gz failed (could not create
tarball)\n");
unlink "$destdir/$newfile_base";
$newfile_base = $newfile_base_gz;
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
