[devscripts] 02/02: uscan: Fix uninitialized value $keyring

[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 16a39e8957ddd2464b6dd6e624509d2d933e099b
Author: Osamu Aoki <osamu at debian.org>
Date:   Sat Nov 14 23:08:18 2015 +0900

    uscan: Fix uninitialized value $keyring
---
 scripts/uscan.pl | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 754534e..8b6f432 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3860,15 +3860,17 @@ sub process_watchfile ($$$$)
     $keyring = first { -r $_ } qw(debian/upstream/signing-key.pgp debian/upstream/signing-key.asc debian/upstream-signing-key.pgp);
     if (defined $keyring) {
 	uscan_verbose "Found upstream signing keyring: $keyring\n";
-    }
-
-    if ($keyring =~ m/\.asc$/) {
-	# Need to convert an armored key to binary for use by gpgv
-	$gpghome = tempdir(CLEANUP => 1);
-	my $newkeyring = "$gpghome/trustedkeys.gpg";
-	spawn(exec => [$havegpg, '--homedir', $gpghome, '--no-options', '-q', '--batch', '--no-default-keyring', '--output', $newkeyring, '--dearmor', $keyring],
-		wait_child => 1);
-	$keyring = $newkeyring
+	if ($keyring =~ m/\.asc$/) {
+	    # Need to convert an armored key to binary for use by gpgv
+	    $gpghome = tempdir(CLEANUP => 1);
+	    my $newkeyring = "$gpghome/trustedkeys.gpg";
+	    spawn(exec => [$havegpg, '--homedir', $gpghome,
+		    '--no-options', '-q', '--batch',
+		    '--no-default-keyring', '--output',
+		    $newkeyring, '--dearmor', $keyring],
+		    wait_child => 1);
+	    $keyring = $newkeyring
+	}
     }
 
     unless (open WATCH, $watchfile) {

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