Update CPANPLUS to CPAN version 0.9110

  [DELTA]

  Changes for 0.9110      Thu Sep  1 13:43:06 2011
  ================================================
  * CPANPLUS::Dist::MM now ensures that Makefile.PL
    is older than any generated Makefile
  * When resolving dependencies ignore any @INC-hook
    when finding installed modules
  * Updated the META.yml in the dist to specify
    'dynamic_config' as true.

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index cc2910d..e3b6fd3 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -459,7 +459,7 @@ use File::Glob qw(:case);
     'CPANPLUS' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.9109.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.9110.tar.gz',
        'FILES'         => q[cpan/CPANPLUS],
        'EXCLUDED'      => [ qr{^inc/},
                             qr{^t/dummy-.*\.hidden$},

diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index d4ab5f2..715be77 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS.pm
@@ -13,7 +13,7 @@ BEGIN {
     use vars        qw( @EXPORT @ISA $VERSION );
     @EXPORT     =   qw( shell fetch get install );
     @ISA        =   qw( Exporter );
-    $VERSION = "0.9109";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.9110";     #have to hardcode or cpan.org gets unhappy
 }
 
 ### purely for backward compatibility, so we can call it from the commandline:

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
index 18c2418..f031e2b 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
@@ -415,6 +415,13 @@ sub prepare {
         ### if we got here, we managed to make a 'makefile' ###
         $dist->status->makefile( MAKEFILE->($dir) );
 
+        ### Make (haha) sure that Makefile.PL is older than the Makefile
+        ### we just generated.
+        eval {
+          my $ftime = time - 4;
+          utime $ftime, $ftime, MAKEFILE_PL->( $cb->_safe_path( path => $dir ) );
+        };
+
         ### start resolving prereqs ###
         my $prereqs = $self->status->prereqs;
 

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index e1d2f7a..647da5a 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
@@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION];
             CPANPLUS::Internals::Report
         ];
 
-$VERSION = "0.9109";
+$VERSION = "0.9110";
 
 =pod
 

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
index dfd1328..bdfe1ae 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
@@ -1291,6 +1291,10 @@ Returns a boolean indicating if this module is uptodate or not.
                             @_,
                         );
 
+            ### Don't trust modules which are the result of @INC hooks
+            ### FatPacker uses this trickery and it causes WTF moments
+            return $alt_rv if defined $href->{dir} && ref $href->{dir};
+
             return $href->{$key} || $alt_rv;
         }
     }

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index 9c3c4a8..d8ec275 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
@@ -26,7 +26,7 @@ local $Data::Dumper::Indent     = 1; # for dumpering from !
 BEGIN {
     use vars        qw[ $VERSION @ISA ];
     @ISA        =   qw[ CPANPLUS::Shell::_Base::ReadLine ];
-    $VERSION = "0.9109";
+    $VERSION = "0.9110";
 }
 
 load CPANPLUS::Shell;

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 8cbae63..c130a2c 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -125,6 +125,10 @@ Resolved an issue where C<unzip> executable was present in C<PATH> on MSWin32
 
 =item *
 
+L<CPANPLUS> has been upgraded from version 0.9109 to version 0.9110.
+
+=item *
+
 L<diagnostics> has been upgraded from version 1.24 to version 1.25.
 
 It now strips out C<SZ<><...>> formatting codes before displaying