[Pgp-tools-commit] r740 - in trunk: caff keylookup

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-12-03 00:25:19 +0000 (Wed, 03 Dec 2014)
New Revision: 740

Modified:
   trunk/caff/caff
   trunk/caff/pgp-clean
   trunk/caff/pgp-fixkey
   trunk/keylookup/keylookup
Log:
wibble

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2014-12-02 23:08:46 UTC (rev 739)
+++ trunk/caff/caff	2014-12-03 00:25:19 UTC (rev 740)
@@ -983,7 +983,7 @@
 
 	while($status =~ /$KEYEDIT_DELSIG_PROMPT/m) {
 		# sig:?::17:EA2199412477CAF8:1058095214:::::13x
-		my @sigline = grep { /^sig:/ } (split /\n/, $stdout);
+		my @sigline = grep /^sig:/, (split /\n/, $stdout);
 		my $answer = "no";
 		if (!@sigline) {
 			debug("[sigremoval] no sig line here, only got:\n".$stdout);
@@ -1343,7 +1343,7 @@
 	unless (defined $CONFIG{'keyserver'}) {
 		my $gpgconf = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/gpg.conf';
 		if (-e $gpgconf and open my $fh, $gpgconf) {
-			my @keyservers = map { chomp; s/^\s*keyserver\s+//r } (grep {/^\s*keyserver\s/} <$fh>);
+			my @keyservers = map { chomp; s/^\s*keyserver\s+//r } (grep /^\s*keyserver\s/, <$fh>);
 			$CONFIG{'keyserver'} = $keyservers[$#keyservers] if @keyservers;
 			close $fh;
 		}

Modified: trunk/caff/pgp-clean
===================================================================
--- trunk/caff/pgp-clean	2014-12-02 23:08:46 UTC (rev 739)
+++ trunk/caff/pgp-clean	2014-12-03 00:25:19 UTC (rev 740)
@@ -328,7 +328,7 @@
 		next;
 	};
 	my $keyinfo = $stdout;
-	my @publine = grep { /^pub/ } (split /\n/, $stdout);
+	my @publine = grep /^pub/, (split /\n/, $stdout);
 	my ($dummy1, $dummy2, $dummy3, $dummy4, $longkeyid, $dummy6, $dummy7, $dummy8, $dummy9, $dummy10, $dummy11, $flags) = split /:/, pop @publine;
 	my $can_encrypt = $flags =~ /E/;
 	unless (defined $longkeyid) {
@@ -421,7 +421,7 @@
 
 	while($status =~ /$KEYEDIT_DELSIG_PROMPT/m) {
 		# sig:?::17:EA2199412477CAF8:1058095214:::::13x:
-		my @sigline = grep { /^sig/ } (split /\n/, $stdout);
+		my @sigline = grep /^sig/, (split /\n/, $stdout);
 		$stdout =~ s/\n/\\n/g;
 		notice("[sigremoval] why are there ".(scalar @sigline)." siglines in that part of the dialog!? got: $stdout") if scalar @sigline >= 2; # XXX
 		my $line = pop @sigline;

Modified: trunk/caff/pgp-fixkey
===================================================================
--- trunk/caff/pgp-fixkey	2014-12-02 23:08:46 UTC (rev 739)
+++ trunk/caff/pgp-fixkey	2014-12-03 00:25:19 UTC (rev 740)
@@ -290,7 +290,7 @@
 		next;
 	};
 	my $keyinfo = $stdout;
-	my @publine = grep { /^pub/ } (split /\n/, $stdout);
+	my @publine = grep /^pub/, (split /\n/, $stdout);
 	if ($#publine < 0) {
 		warn ("No public key found for $keyid.\n");
 		next;
@@ -351,7 +351,7 @@
 
 	while($status =~ /$KEYEDIT_DELSIG_PROMPT/m) {
 		# sig:?::17:EA2199412477CAF8:1058095214:::::13x:
-		my @sigline = grep { /^sig/ } (split /\n/, $stdout);
+		my @sigline = grep /^sig/, (split /\n/, $stdout);
 		$stdout =~ s/\n/\\n/g;
 		notice("[sigremoval] why are there ".(scalar @sigline)." siglines in that part of the dialog!? got: $stdout") if scalar @sigline >= 2; # XXX
 		my $line = pop @sigline;

Modified: trunk/keylookup/keylookup
===================================================================
--- trunk/keylookup/keylookup	2014-12-02 23:08:46 UTC (rev 739)
+++ trunk/keylookup/keylookup	2014-12-03 00:25:19 UTC (rev 740)
@@ -211,8 +211,7 @@
 	my %unique;
 	my @keys = grep { !$unique{$_}++ }
 		# get the keyID; can be 8, 16 or 40 nibbles
-		grep { /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/ }
-		map { s/\s//g; $_ } <ERRFH>;
+		grep /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/, map { s/\s//g; $_ } <ERRFH>;
 	wait;
 
 	# open(STDOUT, ">&SAVEOUT") || die "Cannot restore STDOUT: $!\n";