[devscripts] 01/03: uscan: touch ups suggested by James McCoy

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch multitar
in repository devscripts.

commit 3cbbb3902539443d1df37b1833bde70374a9c898
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Oct 4 02:01:07 2015 +0900

    uscan: touch ups suggested by James McCoy
    
    remove bogus line
    efficient evaluation order
---
 scripts/uscan.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 2e1867a..5d7f0b4 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-    print STDERR "$progname debug: new filename selected for download (pre-filenamemangled): $newfile_base\n" if $debug;
 # -*- tab-width: 8; indent-tabs-mode: t; cperl-indent-level: 4 -*-
 
 # uscan: This program looks for watchfiles and checks upstream ftp sites
@@ -2453,7 +2452,7 @@ sub process_watchline ($$$$$$)
 	}
 
 	# Handle sf.net addresses specially
-	if ($base =~ m%^http://sf\.net/% and ! $bare) {
+	if (! $bare and $base =~ m%^http://sf\.net/%) {
 	    print STDERR "$progname debug: sf.net redirection to qa.debian.org/watch/sf.php\n" if $debug;
 	    $base =~ s%^http://sf\.net/%https://qa.debian.org/watch/sf.php/%;
 	    $filepattern .= '(?:\?.*)?';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git