From 89ddfa67a6a250f3a10f2b56016a72efe32a5c56 Mon Sep 17 00:00:00 2001
From: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Tue, 14 Feb 2012 09:41:51 +0000
Subject: Update CPANPLUS-Dist-Build to CPAN version 0.62

  [DELTA]

  0.62 Mon Feb 13 22:15:57 GMT 2012
    - Test reporting enhancements
---
 Porting/Maintainers.pl                             |  2 +-
 .../CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm | 27 +++++++++++++++++++---
 .../lib/CPANPLUS/Dist/Build/Constants.pm           |  2 +-
 pod/perldelta.pod                                  |  4 ++++
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index fe0f34d542..111489db7e 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -468,7 +468,7 @@ use File::Glob qw(:case);
 
     'CPANPLUS::Dist::Build' => {
         'MAINTAINER'   => 'bingos',
-        'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.60.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.62.tar.gz',
         'FILES'        => q[cpan/CPANPLUS-Dist-Build],
         'EXCLUDED'     => [
             qr{^inc/},
diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
index e3dcee55a8..702d606115 100644
--- a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
+++ b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
@@ -30,7 +30,7 @@ use Locale::Maketext::Simple    Class => 'CPANPLUS', Style => 'gettext';
 
 local $Params::Check::VERBOSE = 1;
 
-$VERSION = '0.60';
+$VERSION = '0.62';
 
 =pod
 
@@ -269,7 +269,8 @@ sub prepare {
     my @buildflags = $dist->_buildflags_as_list( $buildflags );
     $dist->status->_buildflags( $buildflags );
 
-    my $fail;
+    my $fail; my $prereq_fail;
+    my $status = { };
     RUN: {
         # 0.85_01
         ### we resolve 'configure requires' here, so we can run the 'perl
@@ -298,6 +299,7 @@ sub prepare {
                             "-- aborting install",
                             'configure_requires', $self->module ) );
                 $dist->status->prepared(0);
+                $prereq_fail++;
                 $fail++;
                 last RUN;
             }
@@ -318,6 +320,10 @@ sub prepare {
                                 verbose => $verbose )
         ) {
             error( loc( "Build.PL failed: %1", $prep_output ) );
+            if ( $conf->get_conf('cpantest') ) {
+               $status->{stage} = 'prepare';
+               $status->{capture} = $prep_output;
+            }
             $fail++; last RUN;
         }
 
@@ -333,11 +339,12 @@ sub prepare {
     }
 
     ### send out test report? ###
-    if( $fail and $conf->get_conf('cpantest') ) {
+    if( $fail and $conf->get_conf('cpantest') and not $prereq_fail ) {
            $cb->_send_report(
             module  => $self,
             failed  => $fail,
             buffer  => CPANPLUS::Error->stack_as_string,
+            status  => $status,
             verbose => $verbose,
             force   => $force,
         ) or error(loc("Failed to send test report for '%1'",
@@ -567,6 +574,7 @@ sub create {
     $dist->status->_buildflags( $buildflags );
 
     my $fail; my $prereq_fail; my $test_fail;
+    my $status = { };
     RUN: {
 
         my @run_perl    = ( '-e', CPDB_PERL_WRAPPER );
@@ -610,6 +618,10 @@ sub create {
         ) {
             error( loc( "MAKE failed:\n%1", $captured ) );
             $dist->status->build(0);
+            if ( $conf->get_conf('cpantest') ) {
+               $status->{stage} = 'build';
+               $status->{capture} = $captured;
+            }
             $fail++; last RUN;
         }
 
@@ -645,6 +657,10 @@ sub create {
                                       $self, $@ )
                 ) {
                     $dist->status->test(0);
+                    if ( $conf->get_conf('cpantest') ) {
+                      $status->{stage} = 'test';
+                      $status->{capture} = $test_output;
+                    }
                     $fail++; last RUN;
                 }
 
@@ -652,6 +668,10 @@ sub create {
             else {
                 msg( loc( "MAKE TEST passed:\n%1", $test_output ), 0 );
                 $dist->status->test(1);
+                if ( $conf->get_conf('cpantest') ) {
+                   $status->{stage} = 'test';
+                   $status->{capture} = $test_output;
+                }
             }
         }
         else {
@@ -669,6 +689,7 @@ sub create {
             module          => $self,
             failed          => $test_fail || $fail,
             buffer          => CPANPLUS::Error->stack_as_string,
+            status          => $status,
             verbose         => $verbose,
             force           => $force,
             tests_skipped   => $skiptest,
diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm
index 0ca9c90d98..c0fa040ffc 100644
--- a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm
+++ b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm
@@ -9,7 +9,7 @@ BEGIN {
     require Exporter;
     use vars    qw[$VERSION @ISA @EXPORT];
 
-    $VERSION    = '0.60';
+    $VERSION    = '0.62';
     @ISA        = qw[Exporter];
     @EXPORT     = qw[ BUILD_DIR BUILD CPDB_PERL_WRAPPER];
 }
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 9a8f9cfc64..1242bf7df9 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -313,6 +313,10 @@ L<CPAN::Meta::YAML> has been upgraded from version 0.005 to version 0.007.
 
 =item *
 
+L<CPANPLUS::Dist::Build> has been upgraded from version 0.60 to version 0.62.
+
+=item *
+
 L<DB_File> has been upgraded from version 1.824 to version 1.826.
 
 =item *
-- 
cgit v1.2.1