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

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@148 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 5c75332df26fe58e66189c534f362dc08f1620da..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));
                $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;
                sleep 1;
        };
        my $result = $default;

diff --git a/debian/changelog b/debian/changelog
index 5c3f25ac197c140a9fe21e69dc92ec910b45be7e..e25973851901b92ffaaa5552dac2da05024616e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ signing-party (0.4.1-XXX) unreleased; urgency=low
        thanks Christof Douma (Closes: #316129).
      + Create unique attachment filenames, thanks Robin H. Johnson
        (Closes: #318469).
        thanks Christof Douma (Closes: #316129).
      + Create unique attachment filenames, thanks Robin H. Johnson
        (Closes: #318469).

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

   * Depend on libtext-template-perl as caff needs it.
   * Update to Standards-Version 3.6.2, no changes necessary.
 
   * Depend on libtext-template-perl as caff needs it.
   * Update to Standards-Version 3.6.2, no changes necessary.