summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlperl/lib/CPAN.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/tlperl/lib/CPAN.pm')
-rw-r--r--Master/tlpkg/tlperl/lib/CPAN.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/Master/tlpkg/tlperl/lib/CPAN.pm b/Master/tlpkg/tlperl/lib/CPAN.pm
index 1f69119e5f2..0c9b9f5b09f 100644
--- a/Master/tlpkg/tlperl/lib/CPAN.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN.pm
@@ -2,7 +2,7 @@
# vim: ts=4 sts=4 sw=4:
use strict;
package CPAN;
-$CPAN::VERSION = '2.20';
+$CPAN::VERSION = '2.22';
$CPAN::VERSION =~ s/_//;
# we need to run chdir all over and we would get at wrong libraries
@@ -90,11 +90,13 @@ if ($ENV{PERL5_CPAN_IS_RUNNING} && $$ != $ENV{PERL5_CPAN_IS_RUNNING}) {
warn $w;
}
local $| = 1;
+ my $have_been_sleeping = 0;
while ($sleep > 0) {
printf "\r#%5d", --$sleep;
sleep 1;
+ ++$have_been_sleeping;
}
- print "\n";
+ print "\n" if $have_been_sleeping;
}
$ENV{PERL5_CPAN_IS_RUNNING}=$$;
$ENV{PERL5_CPANPLUS_IS_RUNNING}=$$; # https://rt.cpan.org/Ticket/Display.html?id=23735
@@ -284,7 +286,7 @@ sub shell {
}
if (my $histfile = $CPAN::Config->{'histfile'}) {{
unless ($term->can("AddHistory")) {
- $CPAN::Frontend->mywarn("Terminal does not support AddHistory.\n");
+ $CPAN::Frontend->mywarn("Terminal does not support AddHistory.\n\nTo fix enter> install Term::ReadLine::Perl\n\n");
last;
}
$META->readhist($term,$histfile);
@@ -488,7 +490,7 @@ Trying '$root' as temporary haven.
push @$cwd, $root;
}
while () {
- if (chdir $cwd->[0]) {
+ if (chdir "$cwd->[0]") {
return;
} else {
if (@$cwd>1) {