[devscripts] 01/02: uscan: Exit process_watchline early if not downloading/verifying

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 090c7c6a6e7f8a0ab7c7f052308cb2b43dd79286
Author: James McCoy <jamessan at debian.org>
Date:   Sat Apr 23 21:30:13 2016 -0400

    uscan: Exit process_watchline early if not downloading/verifying
    
    Once the upstream site has been scanned for versions, there's no need to
    continue, which also prevents false positive warnings from being
    emitted.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 3 +++
 scripts/uscan.pl | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 98d6ecc..6a5a185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ devscripts (2.16.4) UNRELEASED; urgency=medium
 
   * mk-build-deps:
     + Only remove the deb after install if --remove was specified.
+  * uscan:
+    + Return early from process_watchline if no download or sig verification
+      is taking place.  (Closes: #822233)
 
  -- James McCoy <jamessan at debian.org>  Thu, 21 Apr 2016 19:53:58 -0400
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 4b09b2e..f5cab9d 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3364,6 +3364,13 @@ EOF
 	uscan_die "strange ... <version> stanza = same/previous should have defined \$download_version\n";
     }
 
+    # If we're not downloading or performing signature verification, we can
+    # stop here
+    if (!$download || $signature == -1)
+    {
+	return 0;
+    }
+
     ############################# BEGIN SUB DOWNLOAD ##################################
     my $downloader = sub {
 	my ($url, $fname, $mode) = @_;

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