From d4e225aa1c5074230edc5791bd95fac33d97f8d4 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Tue, 13 Jul 2010 12:14:35 +0100 Subject: [PATCH] Update CPANPLUS to CPAN version 0.9007 [DELTA] Changes for 0.9007 Tue Jul 13 10:44:30 2010 ================================================ * Fix the shell test to skip if test is not being run under a terminal, reported by Justin Case RT #59254 Changes for 0.9006 Fri Jul 9 13:44:22 2010 ================================================ * Finally resolved the issue where a prereq on Config would not be recognised as a core module --- Porting/Maintainers.pl | 2 +- cpan/CPANPLUS/lib/CPANPLUS.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Dist.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Internals.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Module.pm | 9 +++++++-- cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +- cpan/CPANPLUS/t/15_CPANPLUS-Shell.t | 5 ++++- 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 224d615..32e5b5f 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -395,7 +395,7 @@ use File::Glob qw(:case); 'CPANPLUS' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9005.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9007.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 192e5c9..4852f7a 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.9005"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9007"; #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 dafb1ef..86914c5 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm @@ -514,7 +514,7 @@ sub _resolve_prereqs { my $sub = CPANPLUS::Module->can( 'module_is_supplied_with_perl_core' ); my $core = $sub->( $mod ); - unless ( $core ) { + unless ( defined $core ) { error( loc( "No such module '%1' found on CPAN", $mod ) ); next; } diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index df66b8d..eccc50c 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.9005"; +$VERSION = "0.9007"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm index 24e49d4..dd9a99a 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm @@ -359,7 +359,7 @@ sub _send_report { ### version of perl (5.8.6+ and 5.9.2-4 at the time of writing) ### 'Config' is not recognized as a core module. See this bug: ### http://rt.cpan.org/Ticket/Display.html?id=32155 - if( !$obj and !$sub->( $prq_name ) ) { + if( !$obj and !defined $sub->( $prq_name ) ) { msg(loc( "Prerequisite '%1' for '%2' could not be obtained". " from CPAN -- sending N/A grade", $prq_name, $name ), $verbose ); diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm index 2122c6d..3683ab8 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm @@ -447,7 +447,7 @@ L for more details. my $core = $self->module_is_supplied_with_perl_core; ### ok, so it's found in the core, BUT it could be dual-lifed - if ($core) { + if (defined $core) { ### if the package is newer than installed, then it's dual-lifed return if $cb->_vcmp($self->version, $self->installed_version) > 0; @@ -480,8 +480,13 @@ L for more details. ### broken for perl 5.10: Module::CoreList's version key for the ### hash has a different number of trailing zero than $] aka ### $PERL_VERSION. - my $core = $Module::CoreList::version{ 0+$ver }->{ $name }; + my $core; + + if ( exists $Module::CoreList::version{ 0+$ver }->{ $name } ) { + $core = $Module::CoreList::version{ 0+$ver }->{ $name }; + $core = 0 unless $core; + } return $core; } diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index f59d711..27fb9e0 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.9005"; + $VERSION = "0.9007"; } load CPANPLUS::Shell; diff --git a/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t b/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t index 2a7e8c6..c452891 100644 --- a/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t +++ b/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t @@ -37,12 +37,15 @@ my $Default = SHELL_DEFAULT; my $TestMod = TEST_CONF_MODULE; my $TestAuth= TEST_CONF_AUTHOR; +unless ( -t ) { + ok('We are not on a terminal'); + exit 0; +} ### basic load tests use_ok( $Class, 'Default' ); is( $Class->which, SHELL_DEFAULT, "Default shell loaded" ); - ### create an object my $Shell = $Class->new( $Conf ); ok( $Shell, " New object created" ); -- 2.7.4