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

[Julian Gilbey]

Author: jdg
Date: 2006-11-15 01:48:35 +0100 (Wed, 15 Nov 2006)
New Revision: 503

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
* uscan: avoid spurious undefined warning if --package is used

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-11-12 11:09:33 UTC (rev 502)
+++ trunk/debian/changelog	2006-11-15 00:48:35 UTC (rev 503)
@@ -3,8 +3,9 @@
   * deb-reversion: update to new upstream version (Closes: #329374)
   * debc/debi: handle specifying changes file on command line again
     (Closes: #398152)
+  * uscan: avoid spurious undefined warning if --package is used
 
- -- Julian Gilbey <jdg at debian.org>  Sun, 12 Nov 2006 11:08:05 +0000
+ -- Julian Gilbey <jdg at debian.org>  Wed, 15 Nov 2006 00:48:12 +0000
 
 devscripts (2.9.25) unstable; urgency=low
 

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-11-12 11:09:33 UTC (rev 502)
+++ trunk/uscan.pl	2006-11-15 00:48:35 UTC (rev 503)
@@ -1037,7 +1037,11 @@
 	$request = HTTP::Request->new('GET', $upstream_url);
 	$response = $user_agent->request($request, "../$newfile_base");
 	if (! $response->is_success) {
-	    warn "$progname warning: In directory $pkg_dir, downloading\n  $upstream_url failed: " . $response->status_line . "\n";
+	    if (defined $pkg_dir) {
+		warn "$progname warning: In directory $pkg_dir, downloading\n  $upstream_url failed: " . $response->status_line . "\n";
+	    } else {
+		warn "$progname warning: Downloading\n $upstream_url failed:\n" . $response->status_line . "\n";
+	    }
 	    return 1;
 	}
     }
@@ -1054,7 +1058,11 @@
 	    else { delete $ENV{'FTP_PASSIVE'}; }
 	}
 	if (! $response->is_success) {
-	    warn "$progname warning: In directory $pkg_dir, downloading\n  $upstream_url failed: " . $response->status_line . "\n";
+	    if (defined $pkg_dir) {
+		warn "$progname warning: In directory $pkg_dir, downloading\n  $upstream_url failed: " . $response->status_line . "\n";
+	    } else {
+		warn "$progname warning: Downloading\n $upstream_url failed:\n" . $response->status_line . "\n";
+	    }
 	    return 1;
 	}
     }