diff options
| author | Andreas Koenig <a.koenig@mind.de> | 1997-02-17 17:59:13 +1200 |
|---|---|---|
| committer | Chip Salzenberg <chip@atlantic.net> | 1997-02-18 13:22:00 +1200 |
| commit | d4fd5c69aa67ee57d4d0286857bcd78a0847cbe3 (patch) | |
| tree | 42513bea19ca50b48eba3b49244923c084b21ea5 /lib/CPAN | |
| parent | b5b22fbcf1b1bacd1a9901861d72ca7c86e7a840 (diff) | |
| download | perl-d4fd5c69aa67ee57d4d0286857bcd78a0847cbe3.tar.gz | |
Refresh CPAN.pm to 1.21
Diffstat (limited to 'lib/CPAN')
| -rw-r--r-- | lib/CPAN/FirstTime.pm | 16 | ||||
| -rw-r--r-- | lib/CPAN/Nox.pm | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm index 3127a5e32a..c996a1cfbb 100644 --- a/lib/CPAN/FirstTime.pm +++ b/lib/CPAN/FirstTime.pm @@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw(prompt); use FileHandle (); use File::Path (); use vars qw($VERSION); -$VERSION = substr q$Revision: 1.15 $, 10; +$VERSION = substr q$Revision: 1.16 $, 10; =head1 NAME @@ -231,17 +231,18 @@ Testing "$input" ... } } - print qq{ + unless (@{$CPAN::Config->{'wait_list'}||[]}) { + print qq{ WAIT support is available as a Plugin. You need the CPAN::WAIT module to actually use it. But we need to know your favorite WAIT server. If you don\'t know a WAIT server near you, just press ENTER. }; - - $default = "wait://ls6.informatik.uni-dortmund.de:1404"; - $ans = prompt("Your favorite WAIT server?\n ",$default); - push @{$CPAN::Config->{'wait_list'}}, $ans; + $default = "wait://ls6.informatik.uni-dortmund.de:1404"; + $ans = prompt("Your favorite WAIT server?\n ",$default); + push @{$CPAN::Config->{'wait_list'}}, $ans; + } print qq{ @@ -324,8 +325,8 @@ file:, ftp: or http: URL, or "q" to finish selecting. $ans = $other = ""; my(%seen); + my $pipe = -t *STDIN ? "| $CPAN::Config->{'pager'}" : ">/dev/null"; while () { - my $pipe = -t *STDIN ? "| $CPAN::Config->{'pager'}" : ">/dev/null"; my(@valid,$previous_best); my $fh = FileHandle->new; $fh->open($pipe); @@ -351,6 +352,7 @@ file:, ftp: or http: URL, or "q" to finish selecting. } } } + $fh->close; $previous_best ||= 1; $default = @{$CPAN::Config->{urllist}} >= $expected_size ? "q" : $previous_best; diff --git a/lib/CPAN/Nox.pm b/lib/CPAN/Nox.pm index b0b70fec04..dc561977c4 100644 --- a/lib/CPAN/Nox.pm +++ b/lib/CPAN/Nox.pm @@ -1,4 +1,4 @@ -BEGIN{$CPAN::Suppress_readline++;} +BEGIN{$CPAN::Suppress_readline=1 unless defined $CPAN::term;} use CPAN; |