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

[Julian Gilbey]

Author: jdg
Date: 2005-08-20 22:20:46 +0000 (Sat, 20 Aug 2005)
New Revision: 232

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
* uscan: report on package being scanned when --report is used (Closes:
  #324102)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-08-17 18:30:21 UTC (rev 231)
+++ trunk/debian/changelog	2005-08-20 22:20:46 UTC (rev 232)
@@ -2,8 +2,10 @@
 
   * bts: tags: revert change in 2.9: reinstate "fixed-in-experimental" (it
     still appears to be in use) and don't need "help" twice
+  * uscan: report on package being scanned when --report is used (Closes:
+    #324102)
 
- -- Julian Gilbey <jdg at debian.org>  Wed, 17 Aug 2005 19:30:08 +0100
+ -- Julian Gilbey <jdg at debian.org>  Sat, 20 Aug 2005 23:20:05 +0100
 
 devscripts (2.9.5) unstable; urgency=low
 

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2005-08-17 18:30:21 UTC (rev 231)
+++ trunk/uscan.pl	2005-08-20 22:20:46 UTC (rev 232)
@@ -582,8 +582,8 @@
 	    $site = "ftp://$site";
 	    if ($pattern !~ /\(.*\)/) {
 		# watch_version=1 and old style watchfile;
-		# pattern uses ? and * shell wildcards; everything from the first
-		# to last of these metachars is the pattern to match on.
+		# pattern uses ? and * shell wildcards; everything from the
+		# first to last of these metachars is the pattern to match on
 		$pattern =~ s/(\?|\*)/($1/;
 		$pattern =~ s/(\?|\*)([^\?\*]*)$/$1)$2/;
 		$pattern =~ s/\./\\./g;
@@ -1235,7 +1235,12 @@
 
 	# Handle shell \\ -> \
 	s/\\\\/\\/g if $watch_version==1;
-	print "-- In $watchfile, processing watchfile line:\n   $_\n" if $verbose;
+	if ($verbose) {
+	    print "-- In $watchfile, processing watchfile line:\n   $_\n" if $verbose;
+	} elsif ($download == 0 and ! $dehs) {
+	    print "Processing watchfile line for package $package...\n";
+	}
+	    
 	$status +=
 	    process_watchline($_, $watch_version, $dir, $package, $version,
 			      $watchfile);