$CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
$CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'};
$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 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' ) ) {
-} elsif ( defined $params->{'mail'} ) {
- $CONFIG{'mail'} = $params->{'mail'};
-} else {
+
+} elsif ( !defined $CONFIG{'mail'} ) {
$CONFIG{'mail'} = 'ask-yes';
}
$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
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
signing-party (1.1-3) unstable; urgency=low
signing-party (1.1-3) unstable; urgency=low
* gpg-key2ps: assume gpg output to be in utf-8, instead of depending on the
current locale.
* 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@debian.org> Tue, 10 Mar 2009 17:18:21 +0100
signing-party (1.1-2) unstable; urgency=low
-- Christoph Berg <myon@debian.org> Tue, 10 Mar 2009 17:18:21 +0100
signing-party (1.1-2) unstable; urgency=low