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

[Julian Gilbey]

Author: jdg
Date: 2005-09-10 23:31:32 +0000 (Sat, 10 Sep 2005)
New Revision: 250

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
* uscan: correctly handle version 2 watchfiles with multiple groups
  (Closes: #327258)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-09-06 05:54:23 UTC (rev 249)
+++ trunk/debian/changelog	2005-09-10 23:31:32 UTC (rev 250)
@@ -1,10 +1,12 @@
 devscripts (2.9.8) UNRELEASED; urgency=low
 
   * bts: don't require user for usertags (Closes: #326560)
+  * uscan: correctly handle version 2 watchfiles with multiple groups
+    (Closes: #327258)
   * uupdate: handle csae of debian/ directory in upstream sources (Closes:
     #320836)
 
- -- Julian Gilbey <jdg at polya.uklinux.net>  Tue,  6 Sep 2005 02:19:17 +0100
+ -- Julian Gilbey <jdg at polya.uklinux.net>  Sun, 11 Sep 2005 00:31:03 +0100
 
 devscripts (2.9.7) unstable; urgency=low
 

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2005-09-06 05:54:23 UTC (rev 249)
+++ trunk/uscan.pl	2005-09-10 23:31:32 UTC (rev 250)
@@ -720,15 +720,22 @@
 	while ($content =~ m/<\s*a\s+[^>]*href\s*=\s*([\"\'])(.*?)\1/gi) {
 	    my $href = $2;
 	    if ($href =~ m&^$pattern$&) {
-		# need the map { ... } here to handle cases of (...)?
-		# which may match but then return undef values
-		my $mangled_version =
-		    join(".", map { $_ if defined($_) }
-			       $href =~ m&^$pattern$&);
-		foreach my $pat (@{$options{'uversionmangle'}}) {
-		    eval "\$mangled_version =~ $pat;";
+		if ($watch_version == 2) {
+		    # watch_version 2 only recognised one group; the code
+		    # below will break version 2 watchfiles with a construction
+		    # such as file-([\d\.]+(-\d+)?) (bug #327258)
+		    push @hrefs, [$1, $href];
+		} else {
+		    # need the map { ... } here to handle cases of (...)?
+		    # which may match but then return undef values
+		    my $mangled_version =
+			join(".", map { $_ if defined($_) }
+			     $href =~ m&^$pattern$&);
+		    foreach my $pat (@{$options{'uversionmangle'}}) {
+			eval "\$mangled_version =~ $pat;";
+		    }
+		    push @hrefs, [$mangled_version, $href];
 		}
-		push @hrefs, [$mangled_version, $href];
 	    }
 	}
 	if (@hrefs) {