From 19c5ad0c18bc815c0507ae0f83eb33c7798db932 Mon Sep 17 00:00:00 2001 From: weasel Date: Thu, 28 Jul 2005 11:18:55 +0000 Subject: [PATCH] Improve diagnosis if caff can't read answers from STDIN git-svn-id: svn://svn.debian.org/pgp-tools/trunk@154 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 15 ++++++++++++--- debian/changelog | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/caff/caff b/caff/caff index 302bf60..866af19 100755 --- a/caff/caff +++ b/caff/caff @@ -448,8 +448,9 @@ sub readwrite_gpg($$$$$%) { sub ask($$;$$) { my ($question, $default, $forceyes, $forceno) = @_; my $answer; + my $yn = $default ? '[Y/n]' : '[y/N]'; while (1) { - print $question,' ',($default ? '[Y/n]' : '[y/N]'), ' '; + print $question,' ',$yn, ' '; if ($forceyes && $forceno) { print "$default (from config/command line)\n"; return $default; @@ -464,9 +465,17 @@ sub ask($$;$$) { }; $answer = ; + if (!defined $answer) { + $OUTPUT_AUTOFLUSH = 1; + die "\n\n". + "End of STDIN reached. Are you using xargs? Caff wants to read from STDIN,\n". + "so you can't really use it with xargs. A patch against caff to read from\n". + "the terminal would be apprechiated.\n". + "For now instead of cat keys | xargs caff do caff `cat keys`\n"; + }; chomp $answer; - last if ((defined $answer) && (length $answer <= 1)); - print "grrrrrr.\n"; + last if ((length $answer == 0) || ($answer =~ m/^[yYnN]$/) ); + print "What about $yn is so hard to understand?\nAnswer with either 'n' or 'y' or just press enter for the default.\n"; sleep 1; }; my $result = $default; diff --git a/debian/changelog b/debian/changelog index 3f0af19..8e81895 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,10 +15,12 @@ signing-party (0.4.1-1) unstable; urgency=low + create unique attachment filenames, thanks Robin H. Johnson (Closes: #318469). + let caff import keys from file, thanks Jon Åslund (Closes: #318744). + + Improve diagnosis if caff can't read answers from STDIN, like + when people use xargs (Closes: #319519). * Depend on libtext-template-perl as caff needs it. * Update to Standards-Version 3.6.2, no changes necessary. - -- Peter Palfrader Wed, 29 Jun 2005 16:36:08 +0200 + -- Peter Palfrader Thu, 28 Jul 2005 13:17:39 +0200 signing-party (0.4.0-1) unstable; urgency=low -- 2.39.5