In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/a97f47a27063aa59b5124b9d7c3d5a296eae0d48?hp=f12f5f55b96ab324ac99ca675d447de42611ad4e>
- Log ----------------------------------------------------------------- commit a97f47a27063aa59b5124b9d7c3d5a296eae0d48 Author: Chris Williams <[email protected]> Date: Mon Oct 19 20:17:54 2009 +0100 Update CPANPLUS to CPAN version 0.89_03 Changes for 0.89_03 Mon Oct 19 20:06:03 2009 ================================================ * Work out if a prereq is a core module and only warn if we can't satisfy the required version. ----------------------------------------------------------------------- Summary of changes: cpan/CPANPLUS/lib/CPANPLUS.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Dist.pm | 15 ++++++++++++++- cpan/CPANPLUS/lib/CPANPLUS/Internals.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm index 4853d39..b0bc973 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.89_02"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.89_03"; #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.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm index 4bbbd1d..b6ffdbe 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm @@ -464,7 +464,20 @@ sub _resolve_prereqs { #### XXX we ignore the version, and just assume that the latest #### version from cpan will meet your requirements... dodgy =/ unless( $modobj ) { - error( loc( "No such module '%1' found on CPAN", $mod ) ); + # Check if it is a core module + my $sub = CPANPLUS::Module->can( + 'module_is_supplied_with_perl_core' ); + my $core = $sub->( $mod ); + unless ( $core ) { + error( loc( "No such module '%1' found on CPAN", $mod ) ); + next; + } + if ( $cb->_vcmp( $version, $core ) > 0 ) { + error(loc( "Version of core module '%1' ('%2') is too low for ". + "'%3' (needs '%4') -- carrying on but this may be a problem", + $mod, $core, + $self->module, $version )); + } next; } diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index 8eda0a8..60af0a9 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm @@ -42,7 +42,7 @@ use vars q...@isa $VERSION]; CPANPLUS::Internals::Report ]; -$VERSION = "0.89_02"; +$VERSION = "0.89_03"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index 9e9ad39..a83f57a 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.89_02"; + $VERSION = "0.89_03"; } load CPANPLUS::Shell; -- Perl5 Master Repository
