From: Chris Williams <chris@bingosnet.co.uk>
Date: Mon, 25 Jan 2010 10:51:13 +0000 (+0000)
Subject: Update CPANPLUS::Dist::Build to cpan version 0.46
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c1197786c976cdde68b8ee05dc5b15677b02e7f4;p=p5sagit%2Fp5-mst-13.2.git

Update CPANPLUS::Dist::Build to cpan version 0.46

  Extract from Changes file
  =========================

  0.46 Sat Jan 23 07:52:19 GMT 2010
    - actually make the prereq resolving fallback to _build/ querying
      if the 'prereq_data' action fails. *facepalm*

Resolves an issue in prereq resolution where the failure of using
'Build prereq_data' would not fallback to querying _build/ data.

Highlighted by EekBoek distribution which bundled an older version of
Module::Build.
---

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8198cab..b9bc394 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -444,7 +444,7 @@ use File::Glob qw(:case);
     'CPANPLUS::Dist::Build' =>
 	{
 	'MAINTAINER'	=> 'bingos',
-	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-Dist-Build-0.44.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-Dist-Build-0.46.tar.gz',
 	'FILES'		=> q[cpan/CPANPLUS-Dist-Build],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qw{ t/99_pod.t
diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm
index 2bb5070..0f27639 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.44';
+$VERSION = '0.46';
 
 =pod
 
@@ -403,19 +403,19 @@ sub _find_prereqs {
           }
 
         }
-        else {
-          my $file = File::Spec->catfile( $dir, '_build', 'prereqs' );
-          return unless -f $file;
 
-          my $fh = FileHandle->new();
+        my $file = File::Spec->catfile( $dir, '_build', 'prereqs' );
+        return unless -f $file;
 
-          unless( $fh->open( $file ) ) {
-            error( loc( "Cannot open '%1': %2", $file, $! ) );
-            return;
-          }
-        
-          $content = do { local $/; <$fh> };
+        my $fh = FileHandle->new();
+
+        unless( $fh->open( $file ) ) {
+          error( loc( "Cannot open '%1': %2", $file, $! ) );
+          return;
         }
+        
+        $content = do { local $/; <$fh> };
+
       }
 
       return unless $content;
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 6fc6a18..1ac0210 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.44';
+    $VERSION    = '0.46';
     @ISA        = qw[Exporter];
     @EXPORT     = qw[ BUILD_DIR BUILD ];
 }