From 7777db11bfd9461b41e25c8a226e6b30942c6489 Mon Sep 17 00:00:00 2001 From: weasel Date: Tue, 3 Jul 2007 14:04:19 +0000 Subject: [PATCH] Fix typo, fix next/return/undefined bug with send_mail git-svn-id: svn://svn.debian.org/pgp-tools/trunk@336 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/caff/caff b/caff/caff index 9ce3a96..791021a 100755 --- a/caff/caff +++ b/caff/caff @@ -780,7 +780,7 @@ sub send_mail($$$@) { my $reason = $1; my $keyid = $2; if (grep { %_ eq $keyid } @{$CONFIG{'also-encrypt-to'}}) { - warn("Could not encrypt to $keyid, spezified in CONFIG{'also-encrypt-to'}. Try to update the key using gpg --homedir=\$HOME/caff/gnupghome --import ."); + warn("Could not encrypt to $keyid, specified in CONFIG{'also-encrypt-to'}. Try to update the key using gpg --homedir=\$HOME/caff/gnupghome --import ."); return; }; }; @@ -1315,12 +1315,15 @@ for my $keyid (@keyids_ok) { $address =~ s/.*<(.*)>.*/$1/; if (ask("Mail signature for $uid->{'text'} to '$address'?", 1, $CONFIG{'mail'})) { my $mail = send_mail($address, $can_encrypt, $longkeyid, $uid, @attached); - - my $keydir = "$KEYSBASE/$DATE_STRING"; - my $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'}); - open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n"); - print KEY $mail; - close KEY; + if (defined $mail) { + my $keydir = "$KEYSBASE/$DATE_STRING"; + my $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'}); + open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n"); + print KEY $mail; + close KEY; + } else { + warn "Generating mail failed.\n"; + }; }; }; }; -- 2.30.2