From: Chris Williams <chris@bingosnet.co.uk>
Date: Thu, 29 Oct 2009 15:09:29 +0000 (+0000)
Subject: Update CPANPLUS to cpan version 0.89_06
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=13f4e2ac11fc84c6dd0c9663e51e31a68e57ae37;p=p5sagit%2Fp5-mst-13.2.git

Update CPANPLUS to cpan version 0.89_06

  Changes for 0.89_06     Thu Oct 29 14:55:25 2009
  ================================================
  * Fool the installer into replacing our scripts that were installed
    by core with versiononly set.
  * Handle PREREQS being mentioned twice in Makefile. Use _vcmp()
    to compare the versions, take the highest.
---

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 6472b23..6a35023 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_05.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.89_06.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 5fc9ec8..c10d0c1 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_05";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.89_06";     #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/MM.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
index 262c83b..21852ff 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
@@ -480,11 +480,13 @@ sub _find_prereqs {
         
         while( $found =~ m/(?:\s)([\w\:]+)=>(?:q\[(.*?)\],?|undef)/g ) {
             if( defined $p{$1} ) {
-                msg(loc("Warning: PREREQ_PM mentions '%1' more than once. " .
-                        "Last mention wins.", $1 ), $verbose );
+                my $ver = $cb->_version_to_number(version => $2);
+                $p{$1} = $ver
+                  if $cb->_vcmp( $ver, $p{$1} ) > 0;
+            }
+            else {
+                $p{$1} = $cb->_version_to_number(version => $2);                  
             }
-            
-            $p{$1} = $cb->_version_to_number(version => $2);                  
         }
         last;
     }
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index 8657941..8cd6a82 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_05";
+$VERSION = "0.89_06";
 
 =pod
 
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index fda2548..0429122 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_05";
+    $VERSION = "0.89_06";
 }
 
 load CPANPLUS::Shell;