[Pgp-tools-commit] r767 - trunk/gpgsigs

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-01-27 18:34:21 +0000 (Tue, 27 Jan 2015)
New Revision: 767

Modified:
   trunk/gpgsigs/gpgsigs
Log:
gpgsigs: Don't ignore expired keys.

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2015-01-22 22:48:41 UTC (rev 766)
+++ trunk/gpgsigs/gpgsigs	2015-01-27 18:34:21 UTC (rev 767)
@@ -169,12 +169,12 @@
 				chomp;
 				undef $sig unless /^spk:/;
 				if (/^pub:([^:]+):(?:[^:]*:){2}([0-9A-F]{16}):(?:[^:]*:){6}([^:]+)/) {
-					undef $key;
-					if ($1 =~ /[eir]/ or $3 =~ /D/ ) {
-						warn "Ignoring unusable key $2.\n";
+					$key = $2;
+					if ($1 =~ /[ir]/ or $3 =~ /D/ ) {
+						warn "Ignoring unusable key $key.\n";
+						undef $key;
 						last;
 					}
-					$key = $2;
 					$keys{$key} = [];
 					print STDERR '.';
 					@mykeys = map { substr($key,-8) eq $_ ? $key : $_ } @mykeys;