[Bast-commits] r4730 - local-lib/1.000/trunk

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2008-08-06 13:17:33 +0100 (Wed, 06 Aug 2008)
New Revision: 4730

Modified:
   local-lib/1.000/trunk/Makefile.PL
Log:
more mangling to try and get cpan config init to work right

Modified: local-lib/1.000/trunk/Makefile.PL
===================================================================
--- local-lib/1.000/trunk/Makefile.PL	2008-08-06 11:35:44 UTC (rev 4729)
+++ local-lib/1.000/trunk/Makefile.PL	2008-08-06 12:17:33 UTC (rev 4730)
@@ -9,7 +9,6 @@
     $x =~ /^--bootstrap(?:=(.*))?$/;
     my @args = (defined $1 ? ($1) : ());
 
-    $ENV{PERL_MM_USE_DEFAULT} = 1;
     {
       local @INC = @INC;
       unshift(@INC, 'lib');
@@ -29,24 +28,26 @@
     my $cpan_command = '';
 
     system($^X, '-MCPAN', '-e',
-      'CPAN::Config->load;
-       unless (-w $CPAN::Config->{keep_source_where}) {
+      'my $done; require ExtUtils::MakeMaker;
+       my $orig = ExtUtils::MakeMaker->can("prompt");
+       *ExtUtils::MakeMaker::prompt = sub {
+         if (!$done && $_[0] =~ /manual configuration/) {
+           $done++;
+           return "no";
+         }
+         return $orig->(@_);
+       };
+       CPAN::Config->load;
+       unless ($done || -w $CPAN::Config->{keep_source_where}) {
          my $save = $CPAN::Config->{urllist};
          delete @{$CPAN::Config}{keys %$CPAN::Config};
          $CPAN::Config->{urllist} = $save;
-         my $orig = ExtUtils::MakeMaker->can("prompt");
-         my $done;
-         *ExtUtils::MakeMaker::prompt = sub {
-           if (!$done && $_[0] =~ /manual configuration/) {
-             $done++;
-             return "no";
-           }
-           return $orig->(@_);
-         };
          CPAN::Config->init;
        }'
     );
 
+    $ENV{PERL_MM_USE_DEFAULT} = 1;
+
     # XXX - remove the force on EUMM once its test suite survive PERL_MM_OPT
 
     if ($eumm) { # non-zero exit