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

diff --git a/caff/caff b/caff/caff
index 9ce3a966b8c1a91e8133e642778b80ae8b28548f..791021aedcccb5ceeb221c8297f3f390aed56711 100755 (executable)
--- 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 <keyd>.");
+                                       warn("Could not encrypt to $keyid, specified in CONFIG{'also-encrypt-to'}.  Try to update the key using gpg --homedir=\$HOME/caff/gnupghome --import <exported key>.");
                                        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";
+                                       };
                                };
                        };
                };