[devscripts] 02/02: uscan: Only require signing key if downloading an archive

[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 ce56c1047a93ebafae3b7b3bc67e8ec806067c4d
Author: James McCoy <jamessan at debian.org>
Date:   Mon Jul 27 23:00:51 2015 -0400

    uscan: Only require signing key if downloading an archive
    
    Closes: #790047
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 2 ++
 scripts/uscan.pl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fcf583b..bf80f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ devscripts (2.15.6) UNRELEASED; urgency=medium
     the foo binary package for Arch: i386.  “dget --all srcfoo:i386” will
     download all binary packages from the srcfoo source package that are
     either Arch: all or Arch: any/i386.  (Closes: #792917)
+  * uscan: Only check for presence of signing key when downloading a new
+    upstream archive.  (Closes: #790047)
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 58b8416..bfb7211 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -864,7 +864,7 @@ sub process_watchline ($$$$$$)
 	}
 
 	# Check validity of options
-	if (exists $options{'pgpsigurlmangle'}) {
+	if (($download || $force_download) && exists $options{'pgpsigurlmangle'}) {
 	    if (! $havegpgv) {
 		uscan_warn "$progname warning: pgpsigurlmangle option exists, but you must have gpgv installed to verify\n  in $watchfile, skipping:\n  $line\n";
 		return 1;

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