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

[Julian Gilbey]

Author: jdg
Date: 2006-03-15 17:42:02 +0000 (Wed, 15 Mar 2006)
New Revision: 355

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
* uscan: avoid warnings on one-word actions (Closes: #356959)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-12 19:09:04 UTC (rev 354)
+++ trunk/debian/changelog	2006-03-15 17:42:02 UTC (rev 355)
@@ -9,6 +9,7 @@
     just a coding problem, and could have been done for ages (Closes: #354868)
   * pts-subscribe: Depends on the "at" package (Closes: #353502)
   * uupdate: handle already-unpacked source code archives (Closes: #286253)
+  * uscan: avoid warnings on one-word actions (Closes: #356959)
   * debian/rules: remove mention of DH_ALWAYS_EXCLUDE (see Bug#352626)
 
   [ Joey Hess ]

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-03-12 19:09:04 UTC (rev 354)
+++ trunk/uscan.pl	2006-03-15 17:42:02 UTC (rev 355)
@@ -660,8 +660,8 @@
 	($base, $filepattern, $lastversion, $action) = split ' ', $line, 4;
 
 	if ($base =~ m%/([^/]*\([^/]*\)[^/]*)$%) {
-	    # only three fields
-	    $action = "$lastversion $action";
+	    # only three fields; action might be multiword, though
+	    $action = $lastversion . (defined $action ? " $action" : "");
 	    $lastversion = $filepattern;
 	    $filepattern = $1;
 	    $base =~ s%/[^/]+$%/%;