[devscripts] 01/01: uscan: If ! --signature, set to pgpmode=none

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit ce691c3a36b4ba992c13dfbacb0f3e30d1047383
Author: Osamu Aoki <osamu at debian.org>
Date:   Sat Dec 5 22:52:58 2015 +0900

    uscan: If ! --signature, set to pgpmode=none
---
 scripts/uscan.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 3c95174..55d2eb6 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -2399,6 +2399,10 @@ sub process_watchline ($$$$$$)
     my $urlbase;
     my $headers = HTTP::Headers->new;
 
+    if ($signature <= 0) {
+	$options{'pgpmode'} = 'none';
+    }
+
     # Need to clear remembered redirection URLs so we don't try to build URLs
     # from previous watch files or watch lines
     $user_agent->clear_redirections;
@@ -2514,8 +2518,10 @@ sub process_watchline ($$$$$$)
 		} elsif ($opt =~ /^\s*filenamemangle\s*=\s*(.+?)\s*$/) {
 		    @{$options{'filenamemangle'}} = split /;/, $1;
 		} elsif ($opt =~ /^\s*pgpsigurlmangle\s*=\s*(.+?)\s*$/) {
-		    @{$options{'pgpsigurlmangle'}} = split /;/, $1;
-	    	    $options{'pgpmode'} = 'mangle';
+		    if ($signature > 0) {
+			@{$options{'pgpsigurlmangle'}} = split /;/, $1;
+			$options{'pgpmode'} = 'mangle';
+		    }
 		} elsif ($opt =~ /^\s*oversionmangle\s*=\s*(.+?)\s*$/) {
 		    @{$options{'oversionmangle'}} = split /;/, $1;
 		} else {

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