[Dehs-devel] SVN devscripts commit: r324 - in trunk: . debian

[Julian Gilbey]

Author: jdg
Date: 2006-02-13 00:37:32 +0000 (Mon, 13 Feb 2006)
New Revision: 324

Modified:
   trunk/debian/changelog
   trunk/uscan.1
   trunk/uscan.pl
Log:
* uscan: always pass --no-symlink to uupdate as uscan does the
  symlinking itself (Closes: #345874)
* uscan: handle multi-word actions

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-12 16:39:45 UTC (rev 323)
+++ trunk/debian/changelog	2006-02-13 00:37:32 UTC (rev 324)
@@ -2,8 +2,11 @@
 
   * debchange: fall back on NAME envvar if DEBFULLNAME is not defined
     (Closes: #340292)
+  * uscan: always pass --no-symlink to uupdate as uscan does the
+    symlinking itself (Closes: #345874)
+  * uscan: handle multi-word actions
 
- -- Julian Gilbey <jdg at debian.org>  Sun, 12 Feb 2006 16:20:08 +0000
+ -- Julian Gilbey <jdg at debian.org>  Mon, 13 Feb 2006 00:36:12 +0000
 
 devscripts (2.9.13) unstable; urgency=low
 

Modified: trunk/uscan.1
===================================================================
--- trunk/uscan.1	2006-02-12 16:39:45 UTC (rev 323)
+++ trunk/uscan.1	2006-02-13 00:37:32 UTC (rev 324)
@@ -152,16 +152,19 @@
 if the file has a \fI.tar.bz2\fR or a \fI.tbz\fR or \fI.tbz2\fR
 suffix.
 .PP
-Finally, if a third parameter is given in the watchfile line, this is
-taken as the name of a command, and the command
+Finally, if a third parameter (an action) is given in the watchfile
+line, this is taken as the name of a command, and the command
 .nf
     \fIcommand \fB\-\-upstream-version\fI version filename\fR
 .fi
 is executed, using either the original file or the symlink name.  A
-common such command would be \fBuupdate\fR.  (Note that the calling
+common such command would be \fBuupdate\fR(1).  (Note that the calling
 syntax was slightly different when using watchfiles without a
 `version=...' line; there the command executed was `command filename
-version'.)
+version'.)  If the command is \fBuupdate\fR, then the
+\fB\-\-no\-symlink\fR option is given to \fBuupdate\fR as a first
+option, since any requested symlinking will already be done by
+\fBuscan\fR.
 .PP
 The alternative version of the watchfile syntax for HTTP URLs is as
 follows.  The first field is a homepage which should be downloaded and
@@ -375,7 +378,7 @@
 .TP
 .B USCAN_SYMLINK
 If this is set to \fIno\fR, then a pkg_version.orig.tar.{gz|bz2}
-symlink will not be made (equivalent to the \fB\-\-no-symlink\fR
+symlink will not be made (equivalent to the \fB\-\-no\-symlink\fR
 option).  If it is set to \fIyes\fR or \fIsymlink\fR, then the
 symlinks will be made.  If it is set to \fIrename\fR, then the files
 are renamed (equivalent to the \fB\-\-rename\fR option).

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-02-12 16:39:45 UTC (rev 323)
+++ trunk/uscan.pl	2006-02-13 00:37:32 UTC (rev 324)
@@ -189,7 +189,7 @@
 	or $config_vars{'USCAN_SYMLINK'}='yes';
     $config_vars{'USCAN_SYMLINK'}='symlink'
 	if $config_vars{'USCAN_SYMLINK'} eq 'yes' or
-	    $config_vars{'USCAN_SYMLINK'} eq 'symlinks';
+	    $config_vars{'USCAN_SYMLINK'} =~ /^symlinks?$/;
     $config_vars{'USCAN_VERBOSE'} =~ /^(yes|no)$/
 	or $config_vars{'USCAN_VERBOSE'}='no';
     $config_vars{'USCAN_DEHS_OUTPUT'} =~ /^(yes|no)$/
@@ -596,7 +596,7 @@
     %dehs_tags = ('package' => $pkg);
 
     if ($watch_version == 1) {
-	($site, $dir, $pattern, $lastversion, $action) = split ' ', $line;
+	($site, $dir, $pattern, $lastversion, $action) = split ' ', $line, 5;
 
 	if (! defined $lastversion or $site =~ /\(.*\)/ or $dir =~ /\(.*\)/) {
 	    warn "$progname warning: there appears to be a version 2 format line in\n  the version 1 watchfile $watchfile;\n  Have you forgotten a 'version=2' line at the start, perhaps?\n  Skipping the line: $line\n";
@@ -657,12 +657,12 @@
 	    }
 	}
 
-	($base, $filepattern, $lastversion, $action) = split ' ', $line;
+	($base, $filepattern, $lastversion, $action) = split ' ', $line, 4;
 
 	if ($base =~ m%/([^/]*\([^/]*\)[^/]*)$%) {
 	    # only three fields
-	    $action = $lastversion;
-	    $lastversion = $pattern;
+	    $action = "$lastversion $action";
+	    $lastversion = $filepattern;
 	    $filepattern = $1;
 	    $base =~ s%/[^/]+$%/%;
 	}
@@ -1074,6 +1074,11 @@
 	    $usefile = "../${pkg}_${newversion}.orig.tar.bz2";
 	}
 
+	# Any symlink requests are already handled by uscan
+	if ($action =~ /^uupdate(\s|$)/) {
+	    $action =~ s/^uupdate/uupdate --no-symlink/;
+	}
+
 	if ($watch_version > 1) {
 	    print "-- Executing user specified script\n     $action --upstream-version $newversion $newfile_base" if $verbose;
 	    if ($dehs) {