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

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-06-16 14:29:41 +0000 (Tue, 16 Jun 2009)
New Revision: 6692

Modified:
   local-lib/1.000/trunk/Changes
   local-lib/1.000/trunk/Makefile.PL
Log:
Fix Makefile.PL if you have really really old CPAN.pm and you're not trying to --bootstrap

Modified: local-lib/1.000/trunk/Changes
===================================================================
--- local-lib/1.000/trunk/Changes	2009-06-16 13:40:11 UTC (rev 6691)
+++ local-lib/1.000/trunk/Changes	2009-06-16 14:29:41 UTC (rev 6692)
@@ -1,5 +1,8 @@
 Revision history for local::lib
 
+        - Stop Makefile.PL exploding if your CPAN is too old to have
+          CPAN::HandleConfig. Needed when installing local::lib via CPAN
+          using an old CPAN version (t0m)
         - Fix warning from Makefile.PL about ExtUtils::MakeMaker::prompt (t0m)
         - Set PERL5LIB back to calculated @INC with --self-contained, to stop
           invoking other perl scripts from losing the local::lib if they

Modified: local-lib/1.000/trunk/Makefile.PL
===================================================================
--- local-lib/1.000/trunk/Makefile.PL	2009-06-16 13:40:11 UTC (rev 6691)
+++ local-lib/1.000/trunk/Makefile.PL	2009-06-16 14:29:41 UTC (rev 6692)
@@ -99,7 +99,8 @@
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';
 requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
-requires 'CPAN' => '1.80'; # sudo support
+my $required_CPAN = '1.80';
+requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
 # No, really. See
 # https://rt.cpan.org/Public/Bug/Display.html?id=23735
@@ -115,18 +116,35 @@
 
 # and make sure that the user doesn't have any existing CPAN config that'll
 # cause us problems for the next few steps.
-require CPAN::HandleConfig;
-CPAN::HandleConfig->load;
-for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
-    if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
-        die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
-    }
-}
+{
+    local $@;
+    eval { require CPAN::HandleConfig; };
+    # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't
+    # installed yet.
+    # It will already be installed by the time we reach here if bootstrapping,
+    # otherwise, if we're running from CPAN then it will be installed soon
+    # enough, and we'll come back here..
+    if (!$@) {
+        CPAN::HandleConfig->load;
+        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+                die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
+            }
+        }
 
-for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
-    if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
-        die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
+        for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+            if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+                die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
+            }
+        }
     }
+    else {
+        my $error = $@;
+        require CPAN;
+        # Explode if it looks like requiring CPAN::HandleConfig should
+        # have worked, but didn't.
+        die($error) if $CPAN::VERSION >= $required_CPAN;
+    }
 }
 
 if ($bootstrapping) {