Update CPANPLUS to cpan version 0.89_12

  Changes for 0.89_12     Mon Dec  7 13:33:16 2009
  ================================================
  * Resolve RT #52348 Duplicate test output, reported by Apocalypse
  * Fixed typo in Shell::Default, RT #52376, reported by Apocalypse

  Changes for 0.89_11     Tue Dec  1 13:14:24 2009
  ================================================
  * Fixed RT #52287 reported by Apocalypse regarding
    Test::Reporter barfing on send()
  * Change SQLite to AutoCommit, resolves RT #52308,
    reported by Apocalypse

  Changes for 0.89_10     Sat Nov 28 23:20:09 2009
  ================================================
  * Resolve RT #51516 setting conf options which
    include spaces.
  * Explicitly use Cwd's chdir in _chdir()

Update to allow various perl smokers test before update to 0.90

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index f6b045c..20ee322 100755 (executable)
--- 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_09.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.89_12.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 5421106..19b17b0 100644 (file)
--- 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_09";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.89_12";     #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/Config.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm
index bd5373b..740ef1e 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Config.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm
@@ -340,12 +340,17 @@ C<.tar.gz> files)
 =item prefer_makefile
 
 A boolean indicating whether or not prefer a C<Makefile.PL> over a 
-C<Build.PL> file if both are present. Defaults to 'true'.
+C<Build.PL> file if both are present. Defaults to 'true', unless
+the perl version is at least 5.10.1 or appropriate versions of L<Module::Build>
+and L<CPANPLUS::Dist::Build> are available.
 
 =cut
 
         $Conf->{'conf'}->{'prefer_makefile'} = 
-                                ( $] >= 5.010001 ? 0 : 1 );
+            ( $] >= 5.010001 or 
+              ( check_install( module => 'Module::Build', version => '0.32' ) and
+                check_install( module => INSTALLER_BUILD, version => '0.24' ) )
+              ? 0 : 1 );
 
 =item prereqs
 
@@ -536,7 +541,7 @@ $ENV{SHELL} setting, or $ENV{COMSPEC} on Windows.
 
 A string holding the path to your C<sudo> binary if your install path
 requires super user permissions. Looks for C<sudo> in your path, or 
-remains empty if you do not require super user permissiosn to install.
+remains empty if you do not require super user permissions to install.
 
 =cut
 

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
index 4249ecc..be65cd4 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
@@ -689,7 +689,7 @@ sub create {
                 if ( NO_TESTS_DEFINED->( $captured ) ) {
                     msg( NO_TESTS_DEFINED->( $captured ), 0 )
                 } else {
-                    msg( loc( "MAKE TEST passed: %1", $captured ), $verbose );
+                    msg( loc( "MAKE TEST passed: %1", $captured ), 0 );
                 }
             
                 $dist->status->test(1);

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index 0715ba9..61c07b1 100644 (file)
--- 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_09";
+$VERSION = "0.89_12";
 
 =pod
 

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
index a1fe921..774c6b9 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
@@ -566,13 +566,23 @@ sub _send_report {
         }
 
     ### XXX should we do an 'already sent' check? ###
-    } elsif( $reporter->send( ) ) {
-        msg(loc("Successfully sent '%1' report for '%2'", $grade, $dist),
-            $verbose);
-        return 1;
-
     ### something broke :( ###
-    } else {
+    } 
+    else {
+        my $status;
+        eval { 
+            $status = $reporter->send();
+        };
+        if ( $@ ) {
+           error(loc("Could not send '%1' report for '%2': %3",
+                $grade, $dist, $@));
+           return;
+        }
+        if ( $status ) {
+           msg(loc("Successfully sent '%1' report for '%2'", $grade, $dist),
+              $verbose);
+           return 1;
+        }
         error(loc("Could not send '%1' report for '%2': %3",
                 $grade, $dist, $reporter->errstr));
         return;

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm
index 71d33b8..a0ddf49 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm
@@ -48,7 +48,7 @@ CPANPLUS::Internals::Source::SQLite - SQLite implementation
         $Dbh     = DBIx::Simple->connect(
                         "dbi:SQLite:dbname=" . $self->__sqlite_file,
                         '', '',
-                        { AutoCommit => 0 }
+                        { AutoCommit => 1 }
                     );
         #$Dbh->dbh->trace(1);
 

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
index d79320c..27d2abc 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
@@ -5,7 +5,7 @@ use strict;
 use CPANPLUS::Error;
 use CPANPLUS::Internals::Constants;
 
-use Cwd;
+use Cwd qw[chdir];
 use File::Copy;
 use Params::Check               qw[check];
 use Module::Load::Conditional   qw[can_load];

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index eaa9f80..63d2e41 100644 (file)
--- 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_09";
+    $VERSION = "0.89_12";
 }
 
 load CPANPLUS::Shell;
@@ -1220,7 +1220,8 @@ sub _set_conf {
         $args = check( $tmpl, \%hash ) or return;
     }
 
-    my ($type,$key,$value) = $input =~ m/(\w+)\s*(\w*)\s*(.*?)\s*$/;
+    my ($type,$key,$value) = $input =~ m/(\w+)\s*(\w*)\s*(.*?)$/;
+    $value =~ s/\s+$//g if $value;
     $type = lc $type;
 
     if( $type eq 'reconfigure' ) {
@@ -1563,7 +1564,7 @@ should use the same package manager to uninstall them
             loc("All modules %tense(uninstall,past) successfully"), "\n" );
     } else {
         $self->__print( 
-            loc("Problem %tense(uninstalling,present) one or more modules" ),
+            loc("Problem %tense(uninstall,present) one or more modules" ),
             "\n" );
             
         $self->__print(