[Pgp-tools-commit] r424 - in trunk: caff debian
Franck Joncourt
thialme-guest at alioth.debian.org
Sun Apr 5 17:00:59 UTC 2009
Author: thialme-guest
Date: 2009-04-05 17:00:59 +0000 (Sun, 05 Apr 2009)
New Revision: 424
Modified:
trunk/caff/caff
trunk/debian/changelog
Log:
Take the mail variable from caffrc into count. (Closes: #520387)
Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff 2009-03-30 21:50:09 UTC (rev 423)
+++ trunk/caff/caff 2009-04-05 17:00:59 UTC (rev 424)
@@ -933,19 +933,18 @@
$CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
$CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'};
+$CONFIG{'no-mail'} = $params->{'no-mail'} if defined $params->{'no-mail'};
+$CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'};
+
# If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no'
-if ( $CONFIG{'no-mail'} || defined $params->{'no-mail'} ||
- ( defined $params->{'mail'} && $params->{'mail'} eq 'no' ) ) {
+if ( defined $CONFIG{'no-mail'} ||
+ ( defined $CONFIG{'mail'} && $CONFIG{'mail'} eq 'no' ) ) {
$CONFIG{'mail'} = 'no';
-} elsif ( defined $params->{'mail'} ) {
- $CONFIG{'mail'} = $params->{'mail'};
-} else {
+
+} elsif ( !defined $CONFIG{'mail'} ) {
$CONFIG{'mail'} = 'ask-yes';
}
-$CONFIG{'no-mail'} = $params->{'no-mail'} if defined $params->{'no-mail'};
-$CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'};
-
push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-03-30 21:50:09 UTC (rev 423)
+++ trunk/debian/changelog 2009-04-05 17:00:59 UTC (rev 424)
@@ -1,8 +1,13 @@
signing-party (1.1-3) unstable; urgency=low
+ [ Christoph Berg ]
* gpg-key2ps: assume gpg output to be in utf-8, instead of depending on the
current locale.
+ [ Franck Joncourt ]
+ * caff: Take the mail config variable from .caffrc into count.
+ (Closes: #520387)
+
-- Christoph Berg <myon at debian.org> Tue, 10 Mar 2009 17:18:21 +0100
signing-party (1.1-2) unstable; urgency=low
More information about the Pgp-tools-commit
mailing list