summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorChris Williams <chris@bingosnet.co.uk>2009-11-11 00:49:53 +0000
committerChris Williams <chris@bingosnet.co.uk>2009-11-11 00:49:53 +0000
commitb382f077a009e5f5e82bba7d72325124462d742f (patch)
tree9f2332b9ce302f19bc522f4ae86db9258ac15226 /cpan
parent437d4214522421889ca7657c5c9e7dc2f6d1ef7b (diff)
downloadperl-b382f077a009e5f5e82bba7d72325124462d742f.tar.gz
Update CPANPLUS to cpan version 0.89_08
Changes for 0.89_08 Tue Nov 10 23:29:06 2009 ================================================ * Make the default config prefer Build.PL if perl version is greater than or equal to 5.10.1 * Fix a problem with parse_module() where it would not resolve some edge-case distributions, addresses http://perlmonks.org/?node_id=805957 Changes for 0.89_07 Thu Nov 5 14:05:11 2009 ================================================ * MYMETA.yml support added from Jos' branch
Diffstat (limited to 'cpan')
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Backend.pm9
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Config.pm3
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Internals.pm2
-rw-r--r--cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm2
5 files changed, 14 insertions, 4 deletions
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index 53be374480..00e898aaf5 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.89_07"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.89_08"; #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 1702f3573b..a599e5429e 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm
@@ -729,6 +729,15 @@ sub parse_module {
### let's start putting the blame somewhere
} else {
+ # Lets not give up too easily. There is one last chance
+ # http://perlmonks.org/?node_id=805957
+ # This should catch edge-cases where the package name
+ # is unrelated to the modules it contains.
+
+ my ($modobj) = grep { $_->package_name eq $mod }
+ $self->search( type => 'package', allow => [ qr/^\Q$mod\E/ ], );
+ return $modobj if IS_MODOBJ->( module => $modobj );
+
unless( $author ) {
error( loc( "'%1' does not contain an author part", $mod ) );
}
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm
index 28f4fb6ef0..bd5373b513 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Config.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm
@@ -344,7 +344,8 @@ C<Build.PL> file if both are present. Defaults to 'true'.
=cut
- $Conf->{'conf'}->{'prefer_makefile'} = 1;
+ $Conf->{'conf'}->{'prefer_makefile'} =
+ ( $] >= 5.010001 ? 0 : 1 );
=item prereqs
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index d21dc8e0e4..a6c348fcb7 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.89_07";
+$VERSION = "0.89_08";
=pod
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index b37e2b7381..245d32c32b 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.89_07";
+ $VERSION = "0.89_08";
}
load CPANPLUS::Shell;