From 8f5755bc0b04efd9f62b4ef9b675af81030c1639 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Wed, 21 Dec 2011 20:06:41 +0000 Subject: Update CPANPLUS to CPAN version 0.9115 [DELTA] Changes for 0.9115 Tue Dec 20 21:10:24 2011 ================================================ * Added new config option 'allow_unknown_prereqs' to resolve issues with 0.9114 release --- Porting/Maintainers.pl | 2 +- cpan/CPANPLUS/lib/CPANPLUS.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Config.pm | 13 +++++++++++++ cpan/CPANPLUS/lib/CPANPLUS/Dist.pm | 6 ++++-- cpan/CPANPLUS/lib/CPANPLUS/Error.pm | 3 ++- cpan/CPANPLUS/lib/CPANPLUS/Internals.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +- cpan/CPANPLUS/t/inc/conf.pl | 1 + pod/perldelta.pod | 2 +- 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 23fcb37279..d4960294ca 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.9114.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9115.tar.gz', 'FILES' => q[cpan/CPANPLUS], 'EXCLUDED' => [ qr{^inc/}, diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm index 5bea8c3ed6..5c405dbae2 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.9114"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9115"; #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/Config.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm index ead0ae7a2b..c734f8a272 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Config.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm @@ -150,6 +150,19 @@ are run interactively or not. Defaults to 'true'. $Conf->{'conf'}->{'allow_build_interactivity'} = 1; +=item allow_unknown_prereqs + +Boolean flag to indicate that unresolvable prereqs are acceptable. +If C then only warnings will be issued (the behaviour before 0.9114) +when a module is unresolvable from any our sources (CPAN and/or +C). If C then an unresolvable prereq will fail +during the C stage of distribution installation. +Defaults to C. + +=cut + + $Conf->{'conf'}->{'allow_unknown_prereqs'} = 1; + =item base The directory CPANPLUS keeps all its build and state information in. diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm index 22af8463df..73b0d63374 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm @@ -529,7 +529,7 @@ sub _resolve_prereqs { my $conf = $cb->configure_object; my %hash = @_; - my ($prereqs, $format, $verbose, $target, $force, $prereq_build); + my ($prereqs, $format, $verbose, $target, $force, $prereq_build,$tolerant); my $tmpl = { ### XXX perhaps this should not be required, since it may not be ### packaged, just installed... @@ -549,6 +549,8 @@ sub _resolve_prereqs { target => { default => '', store => \$target, allow => ['',qw[create ignore install]] }, prereq_build => { default => 0, store => \$prereq_build }, + tolerant => { default => $conf->get_conf('allow_unknown_prereqs'), + store => \$tolerant }, }; check( $tmpl, \%hash ) or return; @@ -634,7 +636,7 @@ sub _resolve_prereqs { my $core = $sub->( $mod ); unless ( defined $core ) { error( loc( "No such module '%1' found on CPAN", $mod ) ); - $flag++; + $flag++ unless $tolerant; next; } if ( $cb->_vcmp( $version, $core ) > 0 ) { diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Error.pm b/cpan/CPANPLUS/lib/CPANPLUS/Error.pm index ee6cbd8ae2..74acdce191 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Error.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Error.pm @@ -143,7 +143,8 @@ local $| = 1; $ERROR_FH = \*STDERR; $MSG_FH = \*STDOUT; -package Log::Message::Handlers; +package # Hide from Pause + Log::Message::Handlers; use Carp (); { diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index b0cfc7bc7f..569b06b8a0 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.9114"; +$VERSION = "0.9115"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index dcc76bf4db..4ce8bea60a 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.9114"; + $VERSION = "0.9115"; } load CPANPLUS::Shell; diff --git a/cpan/CPANPLUS/t/inc/conf.pl b/cpan/CPANPLUS/t/inc/conf.pl index 4977c39040..66087077e0 100644 --- a/cpan/CPANPLUS/t/inc/conf.pl +++ b/cpan/CPANPLUS/t/inc/conf.pl @@ -143,6 +143,7 @@ sub gimme_conf { $conf->set_conf( base => File::Spec->rel2abs(TEST_CONF_CPANPLUS_DIR)); $conf->set_conf( dist_type => '' ); $conf->set_conf( signature => 0 ); + $conf->set_conf( allow_unknown_prereqs => 1 ); # just to make sure, eh $conf->set_conf( verbose => 1 ) if $ENV{ $Env }; ### never use a pager in the test suite diff --git a/pod/perldelta.pod b/pod/perldelta.pod index db5a96d6a6..92672e20dd 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -103,7 +103,7 @@ XXX =item * -L has been upgraded from version 0.69 to version 0.70. +L has been upgraded from version 0.9113 to version 0.9115. =back -- cgit v1.2.1