From 59af3f666fbdb0851bfe7e6e5da8cc1853767094 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Fri, 29 Oct 2010 12:04:32 +0100 Subject: [PATCH] Update CPANPLUS to CPAN version 0.9010 [DELTA] CHanges for 0.9010 Thu Oct 28 23:20:19 2010 ================================================ * Added PERL_MM_OPT to the CPANPLUS-Dist-MM test to hopefully resolve RT#57241 which relates to local::lib and cpanm Changes for 0.9009 Mon Oct 25 21:03:39 2010 ================================================ * Resolve issues with the SQLite source engine Changes for 0.9008 Mon Oct 25 17:01:34 2010 ================================================ * Normalise prereqs version strings before resolving prereqs --- 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/Source/SQLite.pm | 8 ++++++++ cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +- cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t | 2 +- pod/perldelta.pod | 7 +++++++ 8 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index a9b0a85759..f69fb42e85 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -400,7 +400,7 @@ use File::Glob qw(:case); 'CPANPLUS' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9007.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9010.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 4852f7abee..61284c3a27 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.9007"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9010"; #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 86914c59d7..70010d4bdd 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist.pm @@ -485,7 +485,7 @@ sub _resolve_prereqs { my @install_me; for my $mod ( @sorted_prereqs ) { - my $version = $prereqs->{$mod}; + ( my $version = $prereqs->{$mod} ) =~ s#[^0-9\._]+##g; ### 'perl' is a special case, there's no mod object for it if( $mod eq PERL_CORE ) { diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index eccc50ccc0..1e934fc68d 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.9007"; +$VERSION = "0.9010"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm index 5061ad3f1f..3830750c21 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm @@ -55,6 +55,13 @@ CPANPLUS::Internals::Source::SQLite - SQLite implementation return $Dbh; }; + + sub __sqlite_disconnect { + return unless $Dbh; + $Dbh->disconnect; + $Dbh = undef; + return; + } } { my $used_old_copy = 0; @@ -80,6 +87,7 @@ CPANPLUS::Internals::Source::SQLite - SQLite implementation $used_old_copy = 0; ### chuck the file + $self->__sqlite_disconnect; 1 while unlink $self->__sqlite_file; ### and create a new one diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index 27fb9e0bc3..a71dcf092f 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.9007"; + $VERSION = "0.9010"; } load CPANPLUS::Shell; diff --git a/cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t b/cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t index a203c88ffe..39b3d0defb 100644 --- a/cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t +++ b/cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t @@ -144,7 +144,7 @@ SKIP: { ### lying around. This addresses bug #29716: 20_CPANPLUS-Dist-MM.t ### fails (and leaves test files installed) when EUMM options ### include INSTALL_BASE - { local $ENV{'PERL5_MM_OPT'}; + { local $ENV{'PERL5_MM_OPT'}; local $ENV{'PERL_MM_OPT'}; ### add the new dir to the configuration too, so eu::installed tests ### work as they should diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 3bb991560d..3d00ccea2a 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -203,6 +203,13 @@ C has been upgraded from 1.94_61 to 1.94_62 =item * +C has been upgraded from 0.9007 to 0.9010 + +Fixes for the SQLite source engine and resolving of issues with the +testsuite when run under local::lib and/or cpanminus + +=item * + C has been upgraded from 0.48 to 0.50 =item * -- 2.34.1