Fix warning message

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 8ec09e3c7c2198cee41b797473a2d7f2d8c758b2..5d6121ef0d02cef9313112a574f19c6583398af0 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -777,7 +777,7 @@ sub send_mail($$$@) {
                my ($stdout, $stderr, $status) = readwrite_gpg($message, $inputfd, $stdoutfd, $stderrfd, $statusfd);
                waitpid $pid, 0;
                if ($stdout eq '') {
-                       warn ("No data from gpg for list-key $key_id\n");
+                       warn ("No data from gpg for encrypting mail\n");
                        next;
                };
                $message = $stdout;
@@ -909,8 +909,9 @@ $CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
 $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'};
 push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
 
-for my $keyid (@ARGV) {
+for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument
        $keyid =~ s/^0x//i;
+       $keyid =~ s/ //g; # gpg --fingerprint includes spaces
        if ($keyid =~ /^[A-F0-9]{32}$/i) {
                info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
                next;