In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c1413a7f3faf8fb1e44dd192e26d2ae52b8817ce?hp=2d96a87905c8bdb7056507895dc1493d0fb77b8d>
- Log ----------------------------------------------------------------- commit c1413a7f3faf8fb1e44dd192e26d2ae52b8817ce Author: Andreas J Koenig <[email protected]> Date: Thu May 7 22:25:16 2009 +0200 Update CPAN.pm to 1.93_54 ----------------------------------------------------------------------- Summary of changes: lib/CPAN.pm | 2 +- lib/CPAN/FTP.pm | 4 ++-- lib/CPAN/Tarzip.pm | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/CPAN.pm b/lib/CPAN.pm index 14243a8..bd3d59d 100644 --- a/lib/CPAN.pm +++ b/lib/CPAN.pm @@ -2,7 +2,7 @@ # vim: ts=4 sts=4 sw=4: use strict; package CPAN; -$CPAN::VERSION = '1.93_53'; +$CPAN::VERSION = '1.93_54'; $CPAN::VERSION =~ s/_//; # we need to run chdir all over and we would get at wrong libraries diff --git a/lib/CPAN/FTP.pm b/lib/CPAN/FTP.pm index 98391ea..d8fb593 100644 --- a/lib/CPAN/FTP.pm +++ b/lib/CPAN/FTP.pm @@ -526,7 +526,7 @@ sub _set_attempt { } # package CPAN::FTP; -sub hostdleasy { +sub hostdleasy { #called from hostdlxxx my($self,$host_seq,$file,$aslocal,$stats) = @_; my($ro_url); HOSTEASY: for $ro_url (@$host_seq) { @@ -871,7 +871,7 @@ sub hostdlhardest { return; } $CPAN::Frontend->mywarn(qq{ -As a last ressort we now switch to the external ftp command '$ftpbin' +As a last resort we now switch to the external ftp command '$ftpbin' to get '$aslocal'. Doing so often leads to problems that are hard to diagnose. diff --git a/lib/CPAN/Tarzip.pm b/lib/CPAN/Tarzip.pm index 1790c54..40d5e52 100644 --- a/lib/CPAN/Tarzip.pm +++ b/lib/CPAN/Tarzip.pm @@ -226,14 +226,17 @@ sub untar { if (0) { # makes changing order easier } elsif ($BUGHUNTING) { $prefer=2; - } elsif ($exttar && $extgzip) { - # should be default until Archive::Tar handles bzip2 + } elsif ($exttar && $extgzip && $file =~ /\.bz2$/i) { + # until Archive::Tar handles bzip2 $prefer = 1; } elsif ( $CPAN::META->has_usable("Archive::Tar") && $CPAN::META->has_inst("Compress::Zlib") ) { $prefer = 2; + } elsif ($exttar && $extgzip) { + # no modules and not bz2 + $prefer = 1; } else { my $foundtar = $exttar ? "'$exttar'" : "nothing"; my $foundzip = $extgzip ? "'$extgzip'" : $foundtar ? "nothing" : "also nothing"; -- Perl5 Master Repository
