From: Chris 'BinGOs' Williams Date: Mon, 19 Dec 2011 21:34:59 +0000 (+0000) Subject: Update CPANPLUS to CPAN version 0.9114 X-Git-Tag: accepted/trunk/20130322.191538~1636 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db3e41d4b271fe793325534dbd8abf58985bdcdd;p=platform%2Fupstream%2Fperl.git Update CPANPLUS to CPAN version 0.9114 [DELTA] Changes for 0.9114 Mon Dec 19 21:15:38 2011 ================================================ * Fail earlier on unresolvable prereqs as per [rt.cpan.org #73310] --- diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index c377630..1249ccb 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -447,7 +447,7 @@ use File::Glob qw(:case); 'CPANPLUS' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9113.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9114.tar.gz', 'FILES' => q[cpan/CPANPLUS], 'EXCLUDED' => [ qr{^inc/}, diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm index 6e2ae0c..5bea8c3 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.9113"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9114"; #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 9b85f29..22af846 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm @@ -600,6 +600,8 @@ sub _resolve_prereqs { ### list of module objects + desired versions my @install_me; + my $flag; + for my $mod ( @sorted_prereqs ) { ( my $version = $prereqs->{$mod} ) =~ s#[^0-9\._]+##g; @@ -632,6 +634,7 @@ sub _resolve_prereqs { my $core = $sub->( $mod ); unless ( defined $core ) { error( loc( "No such module '%1' found on CPAN", $mod ) ); + $flag++; next; } if ( $cb->_vcmp( $version, $core ) > 0 ) { @@ -690,7 +693,6 @@ sub _resolve_prereqs { } } - my $flag; for my $aref (@install_me) { my($modobj,$version) = @$aref; diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index f428e3f..b0cfc7b 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.9113"; +$VERSION = "0.9114"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index e56ce68..dcc76bf 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.9113"; + $VERSION = "0.9114"; } load CPANPLUS::Shell; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 7dca8bf..b0d9f58 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -405,7 +405,7 @@ L has been upgraded from version 0.004 to version 0.005. =item * -L has been upgraded from version 0.9112 to version 0.9113. +L has been upgraded from version 0.9112 to version 0.9114. =item *