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

[Julian Gilbey]

Author: jdg
Date: 2006-11-06 04:32:58 +0100 (Mon, 06 Nov 2006)
New Revision: 461

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
* uscan: warn if no parentheses in one-term version 2/3 watchfile
  (Closes: #375557)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-11-06 03:23:49 UTC (rev 460)
+++ trunk/debian/changelog	2006-11-06 03:32:58 UTC (rev 461)
@@ -10,9 +10,11 @@
     with self-signed certificate (Closes: #393942)
   * uscan: fix handling of ftp directory listings with number-only
     directory names (Closes: #372609)
+  * uscan: warn if no parentheses in one-term version 2/3 watchfile
+    (Closes: #375557)
   * uupdate: handle ~ in version numbers (Closes: #397100)
 
- -- Julian Gilbey <jdg at debian.org>  Mon,  6 Nov 2006 03:23:42 +0000
+ -- Julian Gilbey <jdg at debian.org>  Mon,  6 Nov 2006 03:32:51 +0000
 
 devscripts (2.9.22) unstable; urgency=low
 

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-11-06 03:23:49 UTC (rev 460)
+++ trunk/uscan.pl	2006-11-06 03:32:58 UTC (rev 461)
@@ -693,6 +693,12 @@
 	    (undef, $lastversion, $action) = split ' ', $line, 3;
 	}
 
+	# Check all's OK
+	if ($filepattern !~ /\(.*\)/) {
+	    warn "$progname warning: Filename pattern missing version delimiters ()\n  in $watchfile, skipping:\n  $line\n";
+	    return 1;
+	}
+
 	# Check validity of options
 	if ($base =~ /^ftp:/ and exists $options{'downloadurlmangle'}) {
 	    warn "$progname warning: downloadurlmangle option invalid for ftp sites,\n  ignoring in $watchfile:\n  $line\n";