[Dehs-devel] SVN devscripts commit: r399 - trunk

[Julian Gilbey]

Author: jdg
Date: 2006-04-15 22:56:07 +0000 (Sat, 15 Apr 2006)
New Revision: 399

Modified:
   trunk/uscan.pl
Log:
Apply better fix for undefined action field

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-04-15 22:42:34 UTC (rev 398)
+++ trunk/uscan.pl	2006-04-15 22:56:07 UTC (rev 399)
@@ -685,16 +685,12 @@
 
 	($base, $filepattern, $lastversion, $action) = split ' ', $line, 4;
 
-	if ($base =~ m%/([^/]*\([^/]*\)[^/]*)$%) {
-	    # at most three fields; action might be multiword, though
-	    if (defined $lastversion) {
-		$action = $lastversion . (defined $action ? " $action" : "");
-	    }
-	    if (defined $filepattern) {
-		$lastversion = $filepattern;
-	    }
+	if ($base =~ s%/([^/]*\([^/]*\)[^/]*)$%%) {
+	    # Last component of $base has a pair of parentheses, so no
+	    # separate filepattern field; we remove the filepattern from the
+	    # end of $base and rescan the rest of the line
 	    $filepattern = $1;
-	    $base =~ s%/[^/]+$%/%;
+	    (undef, $lastversion, $action) = split ' ', $line, 3;
 	}
 
 	# Check validity of options