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

[Julian Gilbey]

Author: jdg
Date: 2005-08-14 23:39:22 +0000 (Sun, 14 Aug 2005)
New Revision: 225

Modified:
   trunk/debian/changelog
   trunk/uscan.1
   trunk/uscan.pl
Log:
* uscan: --report actually reports useful information (Closes: #313323)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-08-14 17:25:19 UTC (rev 224)
+++ trunk/debian/changelog	2005-08-14 23:39:22 UTC (rev 225)
@@ -15,6 +15,7 @@
     multi-maintainer changelog format
   * debsign: fix noecho behaviour for interrupted gpg call (Closes:
     #321684)
+  * uscan: --report actually reports useful information (Closes: #313323)
   * wnpp-alert: RFA -> RFH (Closes: #321707)
 
  -- Julian Gilbey <jdg at debian.org>  Sun, 14 Aug 2005 18:25:12 +0100

Modified: trunk/uscan.1
===================================================================
--- trunk/uscan.1	2005-08-14 17:25:19 UTC (rev 224)
+++ trunk/uscan.1	2005-08-14 23:39:22 UTC (rev 225)
@@ -269,8 +269,7 @@
 .SH OPTIONS
 .TP
 .B \-\-report, \-\-no\-download
-Only report about newer or absent versions but do not download
-anything.
+Only report about available versions but do not download anything.
 .TP
 .B \-\-download
 Report and download.  (This is the default behaviour.)

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2005-08-14 17:25:19 UTC (rev 224)
+++ trunk/uscan.pl	2005-08-14 23:39:22 UTC (rev 225)
@@ -850,12 +850,12 @@
 
     print "Newest version on remote site is $newversion, local version is $lastversion\n" .
 	($mangled_lastversion eq $lastversion ? "" : " (mangled local version number $mangled_lastversion)\n")
-	if $verbose;
+	if $verbose or $download == 0;
 
     # Can't just use $lastversion eq $newversion, as then 0.01 and 0.1
     # compare different, whereas they are treated as equal by dpkg
     if (system("dpkg --compare-versions '$mangled_lastversion' eq '$newversion'") == 0) {
-	print " => Package is up to date\n" if $verbose;
+	print " => Package is up to date\n" if $verbose or $download == 0;
 	$dehs_tags{'status'} = "up to date";
 	return 0;
     }
@@ -880,17 +880,17 @@
     if (defined $pkg_dir) {
 	if (-f "../$newfile_base") {
 	    print " => $newfile_base already in package directory\n"
-		if $verbose;
+		if $verbose or $download == 0;
 	    return 0;
 	}
 	if (-f "../${pkg}_${newversion}.orig.tar.gz") {
 	    print " => ${pkg}_${newversion}.orig.tar.gz already in package directory\n"
-		if $verbose;
+		if $verbose or $download == 0;
 	    return 0;
 	}
 	elsif (-f "../${pkg}_${newversion}.orig.tar.bz2") {
 	    print " => ${pkg}_${newversion}.orig.tar.bz2 already in package directory\n"
-		if $verbose;
+		if $verbose or $download == 0;
 	    return 0;
 	}
     }