From: thialme-guest Date: Sun, 5 Apr 2009 17:00:59 +0000 (+0000) Subject: Take the mail variable from caffrc into count. (Closes: #520387) X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;ds=inline;h=6c34dde00a9a1ad86d4fa2729f80cf883e3ef91b;p=pgp-tools.git Take the mail variable from caffrc into count. (Closes: #520387) git-svn-id: svn://svn.debian.org/pgp-tools/trunk@424 b513b33f-fedd-0310-b452-c3deb5f4c849 --- diff --git a/caff/caff b/caff/caff index 440816c..436e334 100755 --- a/caff/caff +++ b/caff/caff @@ -933,19 +933,18 @@ $CONFIG{'local-user'} = $params->{'local-user'} if defined $params->{'local-us $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 diff --git a/debian/changelog b/debian/changelog index 7aa8105..57105f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 10 Mar 2009 17:18:21 +0100 signing-party (1.1-2) unstable; urgency=low