[Pgp-tools-commit] r771 - trunk/caff
Guilhem Moulin
guilhem-guest at moszumanska.debian.org
Fri Feb 20 19:35:26 UTC 2015
Author: guilhem-guest
Date: 2015-02-20 19:35:26 +0000 (Fri, 20 Feb 2015)
New Revision: 771
Modified:
trunk/caff/caff
Log:
wibble
Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff 2015-02-20 19:35:18 UTC (rev 770)
+++ trunk/caff/caff 2015-02-20 19:35:26 UTC (rev 771)
@@ -944,7 +944,7 @@
Disposition => 'attachment',
Encoding => "7bit",
Data => "Version: 1\n");
-
+
$message_entity->attach(
Type => "application/octet-stream",
Filename => 'msg.asc',
@@ -1075,7 +1075,7 @@
mywarn "Local-user $user_key is not a valid keyid.";
next;
}
-
+
$user_key =~ s/^0x//;
$user_key =~ y/ //d;
$user_key = uc $user_key;
@@ -1084,7 +1084,7 @@
mywarn "Local-user $user_key is not defined as one of your keyid in ~/.caffrc (it will not be used).";
next;
}
-
+
push @local_user, $user_key;
}
@@ -1333,8 +1333,9 @@
for my $hashkey (qw{local-user no-download no-sign no-mail mail keys-from-gnupg}) {
$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'} ||
+if ( defined $CONFIG{'no-mail'} ||
( defined $CONFIG{'mail'} && $CONFIG{'mail'} eq 'no' ) ) {
$CONFIG{'mail'} = 'no';
More information about the Pgp-tools-commit
mailing list