[devscripts] 05/05: uscan: Skip the line if upstream-signing-key.pgp is needed, but missing

[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 a9f901d22d217478603b5062941c6b32454107b0
Author: James McCoy <jamessan at debian.org>
Date:   Tue Jan 14 21:29:18 2014 -0500

    uscan: Skip the line if upstream-signing-key.pgp is needed, but missing
    
    Closes: #735084
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 2 ++
 scripts/uscan.pl | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f15a4a..8819c91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ devscripts (2.14.1) UNRELEASED; urgency=low
   * uscan:
     + Honor declared options when downloading the PGP signature.  (Closes:
       #735085)
+    + Skip the watchfile line if pgpsigurlmangle is defined but
+      upstream-signing-key.pgp is missing.  (Closes: #735084)
 
  -- Jakub Wilk <jwilk at debian.org>  Fri, 27 Dec 2013 18:39:11 +0100
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 038c29e..51cb756 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -814,8 +814,8 @@ sub process_watchline ($$$$$$)
 	# Check validity of options
 	if (exists $options{'pgpsigurlmangle'}) {
 	    if (not (-r 'debian/upstream-signing-key.pgp')) {
-		uscan_warn "$progname warning: pgpsigurlmangle option exists, but debian/upstream-signing-key.pgp does not exist,\n  ignoring in $watchfile:\n  $line\n";
-		delete $options{'pgpsigurlmangle'};
+		uscan_warn "$progname warning: pgpsigurlmangle option exists, but debian/upstream-signing-key.pgp does not exist\n  in $watchfile, skipping:\n  $line\n";
+		return 1;
 	    } elsif (! $havegpgv) {
 		uscan_warn "$progname warning: pgpsignurlmangle 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