merge the github fork by Alexandr

bobtfish · May 7, 2009 · c09c327 · c09c327
2 parents 02ec0a0 + 474da24
commit c09c327
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,15 @@
+2009-05-07  Andreas J. Koenig  <andk@cpan.org>
+
+	* this is release 1.93_54 (another release candidate for 1.94, I had
+	overlooked the patches by Alexandr)
+
+	* Help Strawberry perl #41537: will prefer perl unpack modules (unless
+	it is bz2). (Alexandr Ciornii)
+
+	* address #43779: test failures when NFS involved (Alexandr Ciornii)
+
+	* adjust tests for 5.6.2 and when no yaml module is available
+
 2009-05-04  Andreas J. Koenig  <andk@cpan.org>
 
 	* this is release 1.93_53 (release candidate for 1.94)

diff --git a/Makefile.PL b/Makefile.PL
@@ -125,6 +125,9 @@ WriteMakefile(
               ($ExtUtils::MakeMaker::VERSION >= 6.3002 ?
                (LICENSE      => "perl") : (),
               ),
+              ($ExtUtils::MakeMaker::VERSION >= 6.48 ?
+               (MIN_PERL_VERSION => '5.004') : (),
+              ),
               clean        => {
                                FILES => "lib/CPAN/Config.pm t/dot-cpan/FTPstats.yml",
                               },
@@ -154,7 +157,10 @@ WriteMakefile(
               # I took it from RT-CPAN ticket 30098:
               ($ExtUtils::MakeMaker::VERSION >= 6.4502 ?
                (META_ADD => {
-                             repository => "git://github.com/andk/cpanpm.git",
+                             resources => {
+                                 repository => "git://github.com/andk/cpanpm.git",
+                             },
+                             keywords => ['CPAN','module','module installation'],
                             }) : ()),
              );
 

diff --git 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
@@ -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";

diff --git a/t/30shell.t b/t/30shell.t
@@ -111,7 +111,7 @@ perl:
 time: 1
 EOF
 }
-
+    close FH; #attempt to fix RT#43779
 cp _f"t/CPAN/authors/id/A/AN/ANDK/CHECKSUMS.2nd",
     _f"t/dot-cpan/sources/authors/id/A/AN/ANDK/CHECKSUMS"
     or die "Could not cp t/CPAN/authors/id/A/AN/ANDK/CHECKSUMS.2nd ".
@@ -139,6 +139,7 @@ match:
 patches:
   - "$cwd/t/CPAN/TestPatch.txt"
 EOF
+close FH; #attempt to fix RT#43779
 
 my @prgs;
 {