+ Improve error when using xargs, thanks Lior Kaplan (Closes: #319519).

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index dd74de713e7d963d779e02de22bdaf3ea679bef3..35739f0cb8d6eaa62066f0252b8a01dd9e6e2f1a 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -457,7 +457,7 @@ sub ask($$;$$) {
                $answer = <STDIN>;
                chomp $answer;
                last if ((defined $answer) && (length $answer <= 1));
-               print "grrrrrr.\n";
+               print "Error reading from STDIN (are you using caff with xargs?).\n";
                sleep 1;
        };
        my $result = $default;
@@ -588,9 +588,9 @@ sub send_mail($$$@) {
                        Type        => "application/pgp-keys",
                        Disposition => 'attachment',
                        Encoding    => "7bit",
-                       Description => "PGP Key 0x$key_id, uid ".($key->{'text'}).' ('.($key->{'serial'}).')',
+                       Description => "PGP Key 0x$key_id, uid ".($key->{'text'}).' ('.($key->{'serial'}).'), signed by 0x'.$CONFIG{'keyid'}[0],
                        Data        => $key->{'key'},
-                       Filename    => "0x$key_id.".$key->{'serial'}.".asc");
+                       Filename    => "0x$key_id.".$key->{'serial'}.".signed-by-0x".$CONFIG{'keyid'}[0].".asc");
        };
 
        if ($can_encrypt) {