Author: adsb
Date: 2009-09-05 00:13:21 +0000 (Sat, 05 Sep 2009)
New Revision: 1994
Modified:
trunk/scripts/uscan.pl
Log:
uscan: Correctly pass --no-symlink to uupdate
Modified: trunk/scripts/uscan.pl
===================================================================
--- trunk/scripts/uscan.pl 2009-09-04 01:06:38 UTC (rev 1993)
+++ trunk/scripts/uscan.pl 2009-09-05 00:13:21 UTC (rev 1994)
@@ -1451,7 +1451,6 @@
# Do whatever the user wishes to do
if ($action) {
my $usefile = "$destdir/$newfile_base";
- my @cmd = shellwords($action);
if ($symlink =~ /^(symlink|rename)$/
and $newfile_base =~ /\.(tar\.gz|tgz)$/) {
$usefile = "$destdir/${pkg}_${newversion}.orig.tar.gz";
@@ -1463,9 +1462,11 @@
# Any symlink requests are already handled by uscan
if ($action =~ /^uupdate(\s|$)/) {
- push @cmd, "--no-symlink";
+ $action =~ s/^uupdate/uupdate --no-symlink/;
}
+ my @cmd = shellwords($action);
+
if ($watch_version > 1) {
push @cmd, ("--upstream-version", "$newversion", "$usefile");
} else {
--
To unsubscribe, send mail to [email protected].
