summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-07-15 16:08:44 +0100
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-07-15 16:08:44 +0100
commit67a23c794408aa2530cd288e513ed53f4a9c73dd (patch)
tree6107918916f980b825b6557ff0229a594bce7bc2
parent62bb6514085e5eddc42b4fdaf3713ccdb7f1da85 (diff)
downloadperl-67a23c794408aa2530cd288e513ed53f4a9c73dd.tar.gz
Update CPANPLUS to CPAN version 0.9108
[DELTA] Changes for 0.9108 Fri Jul 15 15:15:06 2011 ================================================ * Always use INSTALLER_MM for Module-Build
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Internals.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Module.pm3
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm2
-rw-r--r--pod/perldelta.pod2
6 files changed, 8 insertions, 5 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8ed4b0bda5..6c4d2a5ed4 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -459,7 +459,7 @@ use File::Glob qw(:case);
'CPANPLUS' =>
{
'MAINTAINER' => 'kane',
- 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9107.tar.gz',
+ 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9108.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 0f6607b678..c51a2aa9f1 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.9107"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.9108"; #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/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index f126e09f54..e3bb465d8e 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.9107";
+$VERSION = "0.9108";
=pod
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
index c815d28b03..dfd1328a1f 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm
@@ -678,6 +678,9 @@ sub get_installer_type {
$type = INSTALLER_BUILD if $found_build && !$found_makefile;
$type = INSTALLER_MM if $prefer_makefile && $found_makefile;
$type = INSTALLER_MM if $found_makefile && !$found_build;
+ # Special case Module::Build to always use INSTALLER_MM
+ $type = INSTALLER_MM if $self->package =~ m{^Module-Build-\d};
+
}
### ok, so it's a 'build' installer, but you don't /have/ module build
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index 9bfe3e5af1..f1a4b6f3ff 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.9107";
+ $VERSION = "0.9108";
}
load CPANPLUS::Shell;
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 9c65028982..02293de8b0 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -224,7 +224,7 @@ IO::Compress::Zip when the content size was exactly 0xFFFFFFFF.
=item *
-L<CPANPLUS> has been upgraded from version 0.9105 to version 0.9107
+L<CPANPLUS> has been upgraded from version 0.9105 to version 0.9108
=item *