diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2011-09-01 19:24:52 +0100 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2011-09-01 19:24:52 +0100 |
commit | 991864f168b707b220f03916964a3593395b8966 (patch) | |
tree | 54144d502154f539a8649ab04fb1f819b2cee9fa /cpan | |
parent | 86e5639be8611d120113394b3774c1bbb3d94a38 (diff) | |
download | perl-991864f168b707b220f03916964a3593395b8966.tar.gz |
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.
Diffstat (limited to 'cpan')
-rw-r--r-- | cpan/CPANPLUS/lib/CPANPLUS.pm | 2 | ||||
-rw-r--r-- | cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm | 7 | ||||
-rw-r--r-- | cpan/CPANPLUS/lib/CPANPLUS/Internals.pm | 2 | ||||
-rw-r--r-- | cpan/CPANPLUS/lib/CPANPLUS/Module.pm | 4 | ||||
-rw-r--r-- | cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm index d4ab5f2ec7..715be77287 100644 --- 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 18c2418ada..f031e2b786 100644 --- 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 e1d2f7a3ff..647da5a7b5 100644 --- 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 dfd1328a1f..bdfe1ae5fa 100644 --- 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 9c3c4a8e6d..d8ec27523f 100644 --- 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; |