Update CPANPLUS to CPAN version 0.9011

  [DELTA]

  Changes for 0.9011      Fri Jan  7 22:01:56 2011
  ================================================
  * Remove reporting $! after make test fails. It is misleading
    in test reports
  * Don't unset PERL_MM_USE_DEFAULT if it is already set
    in cpan2dist
  * Apply blead patches from Peter Acklam

7 files changed, 9 insertions, 7 deletions

diff --git a/cpan/CPANPLUS/bin/cpan2dist b/cpan/CPANPLUS/bin/cpan2dist
index d12adb10cb..276473949f 100644
--- a/cpan/CPANPLUS/bin/cpan2dist
+++ b/cpan/CPANPLUS/bin/cpan2dist
@@ -54,7 +54,9 @@ my $timeout     = exists $opts->{'timeout'}
                     : 300;
 
 ### use default answers?
-$ENV{'PERL_MM_USE_DEFAULT'} = $opts->{'defaults'} ? 1 : 0;
+unless ( $ENV{'PERL_MM_USE_DEFAULT'} ) {
+  $ENV{'PERL_MM_USE_DEFAULT'} = $opts->{'defaults'} ? 1 : 0;
+}
 
 my $format;
 ### if provided, we go with the command line option, fall back to conf setting
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index bd65595eee..0cc18199ae 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.9010";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.9011";     #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 bd85b6ba44..79f537ae15 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
@@ -694,7 +694,7 @@ sub create {
             
                 $dist->status->test(1);
             } else {
-                error( loc( "MAKE TEST failed: %1 %2", $!, $captured ) );
+                error( loc( "MAKE TEST failed: %1", $captured ) );
             
                 ### send out error report here? or do so at a higher level?
                 ### --higher level --kane.
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index 0aa3853465..127a053b52 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.9010";
+$VERSION = "0.9011";
 
 =pod
 
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm
index e753eeb3a6..b839a75c28 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm
@@ -178,7 +178,7 @@ sub _extract {
     ### set them all to be +w for the owner, so we don't get permission
     ### denied for overwriting files that are just +r
     
-    ### this is too rigorous -- just change to +w for the owner [cpan #13358] 
+    ### this is too rigorous -- just change to +w for the owner [cpan #13358]
     #chmod 0755, map { File::Spec->rel2abs( File::Spec->catdir($to, $_) ) }
     #            @{$ae->files};
     
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index ca507b7f20..187285ef58 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.9010";
+    $VERSION = "0.9011";
 }
 
 load CPANPLUS::Shell;
diff --git a/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t b/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t
index f35d1089f1..fc8f9febe8 100644
--- a/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t
+++ b/cpan/CPANPLUS/t/15_CPANPLUS-Shell.t
@@ -135,7 +135,7 @@ isa_ok( $Shell, $Default,       "   Object" );
 
 __END__
 
-#### test separately, they have side effects     
+#### test separately, they have side effects
 'q'                     => qr/^$/,          # no output!
 's save boxed'          => do { my $re = CONFIG_BOXED;       qr/$re/ },        
 ### this doens't write any output