module-build-checkins

[<kwi...@cv...>]

Author: kwilliams
Date: Thu Apr 27 19:31:04 2006
New Revision: 5977

Modified:
   Module-Build/trunk/lib/Module/Build/Base.pm

Log:
A little more consistency in prompt() and y_n().

Modified: Module-Build/trunk/lib/Module/Build/Base.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/Base.pm	(original)
+++ Module-Build/trunk/lib/Module/Build/Base.pm	Thu Apr 27 19:31:04 2006
@@ -472,22 +472,26 @@
 
 sub _readline {
   my $self = shift;
+  return undef if $self->_is_unattended;
 
-  my $answer;
-  if ( !$self->_is_unattended ) {
-    $answer = <STDIN>;
-    chomp $answer if defined $answer;
-  }
-
+  my $answer = <STDIN>;
+  chomp $answer if defined $answer;
   return $answer;
 }
 
 sub prompt {
   my $self = shift;
-  my ($mess, $def) = @_;
-
-  die "prompt() called without a prompt message" unless $mess;
+  my $mess = shift
+    or die "prompt() called without a prompt message";
 
+  my $def;
+  if ( $self->_is_unattended && !@_ ) {
+    die <<EOF;
+ERROR: This build seems to be unattended, but there is no default value
+for this question.  Aborting.
+EOF
+  }
+  $def = shift if @_;
   ($def, my $dispdef) = defined $def ? ($def, "[$def] ") : ('', ' ');
 
   local $|=1;