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

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-11 22:36:07 +0000 (Mon, 11 Jul 2016)
New Revision: 861

Modified:
   trunk/caff/caff
Log:
wibble

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-11 22:36:04 UTC (rev 860)
+++ trunk/caff/caff	2016-07-11 22:36:07 UTC (rev 861)
@@ -463,34 +463,34 @@
     my ($exitcode, $line) = @_;
     print STDERR mycolored("[ERROR] $line", 'error'), "\n";
     exit $exitcode;
-};
+}
 
 sub mywarn($) {
     my ($line) = @_;
     print STDERR mycolored("[WARN] $line", 'warn'), "\n";
-};
+}
 sub notice($;$) {
     my ($line,$color) = @_;
     $color = $color ? 'success' : 'fail' if defined $color;
     print STDERR mycolored("[NOTICE] $line", 'notice', $color), "\n";
-};
+}
 sub info($$) {
     my ($line,$color) = @_;
     $color = $color ? 'success' : 'fail' if defined $color;
     print STDERR mycolored("[INFO] $line", 'info', $color), "\n";
-};
+}
 sub debug($) {
     my ($line) = @_;
     print STDERR "[DEBUG] $line\n" if $PARAMS->{debug};
-};
+}
 sub trace($) {
     my ($line) = @_;
     #print STDERR "[trace] $line\n";
-};
+}
 sub trace2($) {
     my ($line) = @_;
     #print STDERR "[trace2] $line\n";
-};
+}
 
 sub mysystem(@) {
     system { $_[0] } @_;
@@ -661,7 +661,7 @@
     $template .= "#$_" foreach <DATA>;
     $template .= "#EOM\n";
     return $template;
-};
+}
 
 my @GNUPGOPTS;
 sub load_config() {
@@ -797,7 +797,7 @@
     # depreacted options, will be removed in a future release
     mywarn("Deprecated option \$CONFIG{'$_'} = '$CONFIG{$_}'") foreach
         grep {defined $CONFIG{$_}} qw{gpg-sign gpg-delsig keyserver};
-};
+}
 
 # Create a new GnuPG::Interface object with common options
 sub mkGnuPG(%) {
@@ -845,7 +845,7 @@
     debug(join (', ', map {"$_: " . ($handles->options($_)->{direct} ? $fd{$_}->fileno : $fd{$_})} keys %fd));
 
     return $handles;
-};
+}
 
 sub done_gpg($;$) {
     my ($pid, $handles) = @_;
@@ -972,7 +972,7 @@
     $result = 1 if $answer =~ /y/i;
     $result = 0 if $answer =~ /n/i;
     return $result;
-};
+}
 
 
 
@@ -996,7 +996,7 @@
 sub version($) {
     my ($fd) = @_;
     print $fd "$0 $VERSION - (c) 2004, 2005, 2006 Peter Palfrader et al.\n";
-};
+}
 
 sub usage($$) {
     my ($fd, $exitcode) = @_;
@@ -1004,7 +1004,7 @@
     print $fd "Usage: $0 [-eERS] [-m <yes|ask-yes|ask-no|no>] [-u <yourkeyid>] <keyid> [<keyid> ...]\n";
     print $fd "Consult the manual page for more information.\n";
     exit $exitcode;
-};
+}
 
 ######
 # export keys @$keyids from $gnupghome.  In list context, fork and
@@ -1032,7 +1032,7 @@
         done_gpg($pid, $handles);
         return $asciikey;
     }
-};
+}
 
 
 ######
@@ -1125,7 +1125,7 @@
     $message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'};
     $message_entity->head->add("User-Agent", $USER_AGENT);
     return $message_entity;
-};
+}
 
 ######
 # send a mail message (MIME::Entity)
@@ -1139,7 +1139,7 @@
         $warned_about_broken_mailer_send = 1;
     };
     $message_entity->send(@{$CONFIG{'mailer-send'}});
-};
+}
 
 ######
 # clean up a UID so that it can be used on the FS.
@@ -1151,7 +1151,7 @@
     $good_uid =~ tr#/:\\#_#;
     trace2("[sanitize_uid] changed UID from $uid to $good_uid.\n") if $good_uid ne $uid;
     return $good_uid;
-};
+}
 
 # Delete all non self-sigs that are not made by one of the @$keyids, and
 # return the date of the most recent signature and a hash reference
@@ -1383,14 +1383,14 @@
     '--debug'           =>  \$PARAMS->{'debug'},
     )) {
     usage(\*STDERR, 1);
-};
+}
 if ($PARAMS->{'help'}) {
     usage(\*STDOUT, 0);
-};
+}
 if ($PARAMS->{'version'}) {
     version(\*STDOUT);
     exit(0);
-};
+}
 
 if (-t \*STDIN) {
     # we're already talking to a TTY
@@ -1455,14 +1455,12 @@
 }
 
 for my $hashkey (qw{local-user no-download no-sign no-mail mail keys-from-gnupg}) {
-    $CONFIG{$hashkey} = $PARAMS->{$hashkey}  if defined $PARAMS->{$hashkey};
-};
+    $CONFIG{$hashkey} = $PARAMS->{$hashkey} if defined $PARAMS->{$hashkey};
+}
 
 # If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no'
-if ( defined $CONFIG{'no-mail'} ||
-     ( defined $CONFIG{'mail'} && $CONFIG{'mail'}  eq 'no' ) ) {
+if ( defined $CONFIG{'no-mail'} || (defined $CONFIG{'mail'} && $CONFIG{'mail'} eq 'no') ) {
     $CONFIG{'mail'} = 'no';
-
 } elsif ( !defined $CONFIG{'mail'} ) {
     $CONFIG{'mail'} = 'ask-yes';
 }
@@ -1478,12 +1476,12 @@
     elsif ($keyid !~ /^((?:0x)?\p{AHex}{8}|(?:0x)?\p{AHex}{16}|\p{AHex}{40}|(?:\p{AHex}{4} ){5}(?: \p{AHex}{4}){5})$/) {
         print STDERR "$keyid is not a keyid.\n";
         usage(\*STDERR, 1);
-    };
+    }
 
     $keyid =~ s/^0x//;
     $keyid =~ y/ //d; # gpg --fingerprint includes spaces
     push @KEYIDS, uc($keyid);
-};
+}
 
 
 if (GnuPG_version('2.1.0') >= 0) {
@@ -1607,7 +1605,7 @@
         };
         push @KEYIDS, keys %local_keyids;
     }
-};
+}
 
 if ($CONFIG{'ask-sign'} && ! $CONFIG{'no-sign'}) {
     $CONFIG{'no-sign'} = ! ask("Continue with signing?", 1);
@@ -2001,7 +1999,7 @@
     }
 
     info("Key 0x$longkeyid done", 1);
-};
+}
 
 ###########################
 # the default mail template