diff options
| author | Jos I. Boumans <jos@dwim.org> | 2009-04-28 17:05:31 +0200 |
|---|---|---|
| committer | Vincent Pit <perl@profvince.com> | 2009-04-28 17:05:31 +0200 |
| commit | 02f445e176402de5767475afb737c83d1f20d64f (patch) | |
| tree | 0a51b79d21a1410b2f699aa387bdce9cc7d14563 /lib | |
| parent | 287a962e687f7bb371dc3759b32ea8df45f0ba62 (diff) | |
| download | perl-02f445e176402de5767475afb737c83d1f20d64f.tar.gz | |
Update CPANPLUS to 0.8601
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CPANPLUS.pm | 2 | ||||
| -rw-r--r-- | lib/CPANPLUS/Internals.pm | 2 | ||||
| -rw-r--r-- | lib/CPANPLUS/Module.pm | 10 | ||||
| -rw-r--r-- | lib/CPANPLUS/Selfupdate.pm | 2 | ||||
| -rw-r--r-- | lib/CPANPLUS/Shell/Default.pm | 2 | ||||
| -rw-r--r-- | lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/lib/CPANPLUS.pm b/lib/CPANPLUS.pm index c1d0377d4e..a4b95693a6 100644 --- a/lib/CPANPLUS.pm +++ b/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.86"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.8601"; #have to hardcode or cpan.org gets unhappy } ### purely for backward compatibility, so we can call it from the commandline: diff --git a/lib/CPANPLUS/Internals.pm b/lib/CPANPLUS/Internals.pm index 33628ef5a8..f5d961b518 100644 --- a/lib/CPANPLUS/Internals.pm +++ b/lib/CPANPLUS/Internals.pm @@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION]; CPANPLUS::Internals::Report ]; -$VERSION = "0.86"; +$VERSION = "0.8601"; =pod diff --git a/lib/CPANPLUS/Module.pm b/lib/CPANPLUS/Module.pm index 67b78b8bd2..b5602e1c85 100644 --- a/lib/CPANPLUS/Module.pm +++ b/lib/CPANPLUS/Module.pm @@ -676,15 +676,19 @@ sub get_installer_type { } ### ok, so it's a 'build' installer, but you don't /have/ module build - if( $type eq INSTALLER_BUILD and + ### XXX duplicated from CPANPLUS::Selfupdate. fix somehow? + if( $type eq INSTALLER_BUILD and ( not CPANPLUS::Dist->has_dist_type( INSTALLER_BUILD ) - ) { + or not $cb->module_tree( INSTALLER_BUILD ) + ->is_uptodate( version => '0.24' ) + ) ) { ### XXX this is for recording purposes only. We *have* to install ### these before even creating a dist object, or we'll get an error ### saying 'no such dist type'; + ### XXX duplicated from CPANPLUS::Selfupdate. fix somehow? my $href = $self->status->configure_requires || {}; - my $deps = { INSTALLER_BUILD, 0, %$href }; + my $deps = { INSTALLER_BUILD, '0.24', %$href }; $self->status->configure_requires( $deps ); diff --git a/lib/CPANPLUS/Selfupdate.pm b/lib/CPANPLUS/Selfupdate.pm index b8b40edc70..1346de8cbb 100644 --- a/lib/CPANPLUS/Selfupdate.pm +++ b/lib/CPANPLUS/Selfupdate.pm @@ -79,7 +79,7 @@ CPANPLUS::Selfupdate my $cb = shift; $cb->configure_object->get_conf('prefer_makefile') ? { } - : { 'CPANPLUS::Dist::Build' => '0.04' }; + : { 'CPANPLUS::Dist::Build' => '0.24' }; }, sub { return 1 }, # always enabled ], diff --git a/lib/CPANPLUS/Shell/Default.pm b/lib/CPANPLUS/Shell/Default.pm index 8c4f810e12..8e059f7b17 100644 --- a/lib/CPANPLUS/Shell/Default.pm +++ b/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.86"; + $VERSION = "0.8601"; } load CPANPLUS::Shell; diff --git a/lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t b/lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t index 6ac77f6aad..55007ba566 100644 --- a/lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t +++ b/lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t @@ -49,6 +49,8 @@ ok( not grep { $_ eq $Inst } CPANPLUS::Dist->dist_types, ok( scalar(keys(%$href)), " Dependencies recorded" ); ok( defined $href->{$Inst}, " Dependency on $Inst" ); + cmp_ok( $href->{$Inst}, '>', 0, + " Minimum version: $href->{$Inst}" ); my $err = CPANPLUS::Error->stack_as_string; like( $err, qr/$Inst/, " Message mentions $Inst" ); |