From: Chris Williams Date: Sat, 17 Oct 2009 15:37:54 +0000 (+0100) Subject: Update CPANPLUS to CPAN version 0.89_02 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=704e1b1ec3309aeb0e2629c93331ffd4c18c8183;p=p5sagit%2Fp5-mst-13.2.git Update CPANPLUS to CPAN version 0.89_02 Changes for 0.89_02 Sat Oct 17 13:04:59 2009 ================================================ * Core module prereqs should be dealt with correctly now. Changes for 0.89_01 Fri Oct 16 10:22:43 2009 ================================================ * Corrected spelling mistake in CPANPLUS::Configure documentation * Fixed a problem with the core module detection when sending NA reports * Internals::Report will use Parse::CPAN::Meta instead of YAML::Tiny for parsing CPAN Test report data * Address #50428 Fixed edge-case in the arbitary paths support in parse_module(), reported by Robert Krimen * Address #49104 Fixed the SYNOPSIS in CPANPLUS::Module::Author::Fake reported by Tyler MacDonald * Address #47820 Don't try to update custom sources if they are disabled in configuration, reported by Curtis Jewell --- diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index ad5b0b7..4a4933d 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -414,7 +414,7 @@ use File::Glob qw(:case); 'CPANPLUS' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'KANE/CPANPLUS-0.88.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.89_02.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 8ef3595..4853d39 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.88"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.89_02"; #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/Backend.pm b/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm index 24336f4..1702f35 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm @@ -493,7 +493,7 @@ sub parse_module { } ### Special case arbitary file paths such as '.' etc. - if (-d File::Spec->rel2abs($mod) ) { + if ( $mod and -d File::Spec->rel2abs($mod) ) { my $dir = File::Spec->rel2abs($mod); my $parent = File::Spec->rel2abs( File::Spec->catdir( $dir, '..' ) ); diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm index 2d249e5..baac91d 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm @@ -72,7 +72,7 @@ a method call on a C object. =item load_configs -Controls wether or not additional user configurations are to be loaded +Controls whether or not additional user configurations are to be loaded or not. Defaults to C. =cut diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index 3df48c8..8eda0a8 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.88"; +$VERSION = "0.89_02"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm index da46f55..07f898d 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm @@ -306,7 +306,7 @@ managed to load: $want ], ### might be empty entries in there - } grep { defined $_ } @prq; + } grep { $_ } @prq; return $str; }; diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm index 2e793d3..312a83c 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm @@ -56,9 +56,9 @@ otherwise. ### XXX remove this list and move it into selfupdate, somehow.. ### this is dual administration { my $query_list = { - 'File::Fetch' => '0.13_02', - 'YAML::Tiny' => '0.0', - 'File::Temp' => '0.0', + 'File::Fetch' => '0.13_02', + 'Parse::CPAN::Meta' => '0.0', + 'File::Temp' => '0.0', }; my $send_list = { @@ -196,7 +196,7 @@ sub _query_report { do { local $/; <$fh> }; }; - my ($aref) = eval { YAML::Tiny::Load( $res ) }; + my ($aref) = eval { Parse::CPAN::Meta::Load( $res ) }; if( $@ ) { error(loc("Error reading result: %1", $@)); @@ -358,7 +358,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( not $obj and not $sub->( $prq_name ) ) { + if( !$obj and !$sub->( $prq_name ) ) { msg(loc( "Prerequisite '%1' for '%2' could not be obtained". " from CPAN -- sending N/A grade", $prq_name, $name ), $verbose ); @@ -367,7 +367,20 @@ sub _send_report { last GRADE; } - if( $cb->_vcmp( $prq_ver, $obj->installed_version ) > 0 ) { + if ( !$obj ) { + my $vcore = $sub->( $prq_name ); + if ( $cb->_vcmp( $prq_ver, $vcore ) > 0 ) { + msg(loc( "Version of core module '%1' ('%2') is too low for ". + "'%3' (needs '%4') -- sending N/A grade", + $prq_name, $vcore, + $name, $prq_ver ), $verbose ); + + $grade = GRADE_NA; + last GRADE; + } + } + + if( $obj and $cb->_vcmp( $prq_ver, $obj->installed_version ) > 0 ) { msg(loc( "Installed version of '%1' ('%2') is too low for ". "'%3' (needs '%4') -- sending N/A grade", $prq_name, $obj->installed_version, diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm index 1d4a2d3..54e9d71 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm @@ -318,8 +318,10 @@ sub _check_trees { ### if we're explicitly asked to update the sources, or if the ### standard source files are out of date, update the custom sources ### as well + ### RT #47820: Don't try to update custom sources if they are disabled + ### in the configuration. $self->__update_custom_module_sources( verbose => $verbose ) - if $update_source or !$uptodate; + if $conf->get_conf('enable_custom_sources') and ( $update_source or !$uptodate ); return $uptodate; } diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm b/cpan/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm index 115c29e..3156c5c 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm @@ -22,7 +22,7 @@ CPANPLUS::Module::Author::Fake =head1 SYNOPSIS my $auth = CPANPLUS::Module::Author::Fake->new( - name => 'Foo Bar', + author => 'Foo Bar', email => 'luser@foo.com', cpanid => 'FOO', _id => $cpan->id, diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index faeb6ff..9e9ad39 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.88"; + $VERSION = "0.89_02"; } load CPANPLUS::Shell;