From: Chris Williams <chris@bingosnet.co.uk>
Date: Wed, 11 Nov 2009 00:49:53 +0000 (+0000)
Subject: Update CPANPLUS to cpan version 0.89_08
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b382f077a009e5f5e82bba7d72325124462d742f;p=p5sagit%2Fp5-mst-13.2.git

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
---

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 39c3a58..41001af 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -423,7 +423,7 @@ use File::Glob qw(:case);
     'CPANPLUS' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.89_07.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.89_08.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 53be374..00e898a 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 1702f35..a599e54 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 28f4fb6..bd5373b 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 d21dc8e..a6c348f 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 b37e2b7..245d32c 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;