[Pgp-tools-commit] r840 - trunk/caff

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-02-19 16:50:56 +0000 (Fri, 19 Feb 2016)
New Revision: 840

Modified:
   trunk/caff/caff
Log:
wibble

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-02-18 22:33:34 UTC (rev 839)
+++ trunk/caff/caff	2016-02-19 16:50:56 UTC (rev 840)
@@ -1850,15 +1850,15 @@
     next unless exists $KEYS{$keyid};
     my $longkeyid = $KEYS{$keyid}->{longkeyid};
     my $can_encrypt = $KEYS{$keyid}->{flags} =~ /E/;
-    my @UIDS = @{$KEYS{$keyid}->{uids}};
+    my @uids = @{$KEYS{$keyid}->{uids}};
 
-    unless (grep {$_->{last_signed_on}} @UIDS) {
+    unless (grep {$_->{last_signed_on}} @uids) {
         info("Key 0x$longkeyid has no signed uids, skipping", 0);
         next;
     }
 
     my @attached;
-    for my $uid (@UIDS) {
+    for my $uid (@uids) {
         my $text = defined $LOCALE ? $LOCALE->encode($uid->{text}) : $uid->{text};
 
         trace("UID: $text\n");
@@ -1907,18 +1907,18 @@
         info("Key 0x$longkeyid ".(uc $uid->{type})." $uid->{serial} $text done", 1);
     }
 
-    @UIDS = grep {$_->{last_signed_on}} @UIDS;              # ignore UIDs we didn't sign
-    delete $_->{key} foreach grep {!$_->{export}} @UIDS;    # delete non-exported keys
+    @uids = grep {$_->{last_signed_on}} @uids;              # ignore UIDs we didn't sign
+    delete $_->{key} foreach grep {!$_->{export}} @uids;    # delete non-exported keys
 
-    if (!grep {defined $_->{address}} @UIDS) {
+    if (!grep {defined $_->{address}} @uids) {
         mywarn "No signed RFC 5322 UID on $longkeyid; won't send other signed UID and attributes!"
             if @attached;
     }
-    elsif (grep {$_->{export}} @UIDS) {
+    elsif (grep {$_->{export}} @uids) {
         notice("Key 0x$longkeyid has no encryption capabilities, mail(s) will be sent/stored unencrypted", 0) unless $can_encrypt;
         my $sendmail = $can_encrypt ? $CONFIG{'mail'} : $CONFIG{'mail-cant-encrypt'};
 
-        for my $uid (@UIDS) {
+        for my $uid (@uids) {
             next unless defined $uid->{address};
             next unless $uid->{export} or @attached;
             my @keys = @attached;