[devscripts] 01/02: uscan: Fix "defer" typo

James McCoy jamessan at debian.org
Fri Jul 7 04:27:57 UTC 2017


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

jamessan pushed a commit to branch master
in repository devscripts.

commit 249c84d0171557ab4e6858266c4a9e001109aaf7
Author: James McCoy <jamessan at debian.org>
Date:   Thu Jul 6 22:58:23 2017 -0400

    uscan: Fix "defer" typo
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/uscan.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 8091859..b5c93b9 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1525,6 +1525,10 @@ examined, a newer upstream version was located.
 
 No newer upstream versions were located for any of the F<watch> files examined.
 
+=item B<2>
+
+GPG signature verification failed.
+
 =back
 
 =head1 ADVANCED FEATURES
@@ -3632,8 +3636,7 @@ EOF
 	    unless(system($havegpgv, '--homedir', '/dev/null',
 		    '--keyring', $keyring,
 		    "$destdir/$sigfile", "$destdir/$sigfile_base") >> 8 == 0) {
-		uscan_warn("OpenPGP signature did not verify.\n");
-		return 1;
+		uscan_die("OpenPGP signature did not verify.\n");
 	    }
 	}
 	$previous_newfile_base = undef;
@@ -3647,7 +3650,7 @@ EOF
 	$previous_newversion = undef;
 	$previous_download_available = undef;
     } elsif ($options{'pgpmode'} eq 'next') {
-	uscan_verbose "Differ checking OpenPGP signature to the next watch line\n";
+	uscan_verbose "Defer checking OpenPGP signature to the next watch line\n";
 	$previous_newfile_base = $newfile_base;
 	$previous_sigfile_base = $sigfile_base;
 	$previous_newversion = $newversion;

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



More information about the devscripts-devel mailing list