[Bast-commits] r6273 - in local-lib/1.000/trunk: . lib/local

[apeiron at dev.catalyst.perl.org]

Author: apeiron
Date: 2009-05-15 15:53:10 +0000 (Fri, 15 May 2009)
New Revision: 6273

Modified:
   local-lib/1.000/trunk/Changes
   local-lib/1.000/trunk/Makefile.PL
   local-lib/1.000/trunk/lib/local/lib.pm
Log:
Check for bad options in CPAN config. Fix bootstrapping, thanks to confound.


Modified: local-lib/1.000/trunk/Changes
===================================================================
--- local-lib/1.000/trunk/Changes	2009-05-15 14:04:32 UTC (rev 6272)
+++ local-lib/1.000/trunk/Changes	2009-05-15 15:53:10 UTC (rev 6273)
@@ -1,5 +1,12 @@
 Revision history for local::lib
 
+1.004000 2009-05-14
+        - Don't allow dangerous settings for CPAN.pm that affect where CPAN
+          installs stuff, as this conflicts with what we're trying to do.
+
+        - Make sure that our Makefile is written to the correct directory when
+          bootstrapping (confound).
+
 1.003004 2009-05-12
         - Additional documentation and examples concerning having multiple
           local::lib enviornments (amiri)

Modified: local-lib/1.000/trunk/Makefile.PL
===================================================================
--- local-lib/1.000/trunk/Makefile.PL	2009-05-15 14:04:32 UTC (rev 6272)
+++ local-lib/1.000/trunk/Makefile.PL	2009-05-15 15:53:10 UTC (rev 6273)
@@ -1,8 +1,12 @@
 use strict;
 use warnings;
-use vars qw($bootstrapping);
+use File::Spec;
+use Cwd;
+use vars qw($bootstrapping $bootstrapping_args);
 
+my $cwd;
 BEGIN {
+  $cwd = Cwd::cwd();
   # watch out for fancy dashes. these can wind up in our @ARGV if the user is
   # copypasting the bootstrap command from the POD displayed e.g. by perldoc
   # on a Mac OS X terminal. since no software recognizes and handles these
@@ -22,8 +26,8 @@
   if (my ($x) = grep { /^--bootstrap(?:=.*)?$/ } @ARGV) {
     @ARGV = grep { !/^--bootstrap(?:=.*)?$/ } @ARGV;
     $bootstrapping = 1;
-    $x =~ /^--bootstrap(?:=(.*))?$/;
-    my @args = (defined $1 ? ($1) : ());
+    my ($path) = $x =~ /^--bootstrap(?:=(.*))?$/;
+    my @args = $path ? $path : ();
 
     {
       local @INC = @INC;
@@ -33,8 +37,10 @@
 
     local::lib->import(@args);
 
+    my @libs = map { "-I$_" } split ':', $ENV{PERL5LIB};
+    $bootstrapping_args = "@libs";
     push(@ARGV,$ENV{PERL_MM_OPT});
-    push(@ARGV, map { "-I$_" } split(':',$ENV{PERL5LIB}));
+    push(@ARGV, @libs);
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
@@ -78,6 +84,8 @@
     if ($cpan) {
       system($^X, '-MCPAN', '-e', 'CPAN::Config->load; CPAN::Config->commit;');
     }
+
+    chdir($cwd);
   }
 }
 
@@ -102,10 +110,30 @@
 require CPAN;
 delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
 
+# 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};
+    }
+}
+
+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};
+    }
+}
+
 if ($bootstrapping) {
   auto_install_now;
+  postamble <<"END";
+PERL     += $bootstrapping_args
+FULLPERL += $bootstrapping_args
+END
 } else {
   auto_install;
 }
-
+chdir($cwd);
 WriteAll;

Modified: local-lib/1.000/trunk/lib/local/lib.pm
===================================================================
--- local-lib/1.000/trunk/lib/local/lib.pm	2009-05-15 14:04:32 UTC (rev 6272)
+++ local-lib/1.000/trunk/lib/local/lib.pm	2009-05-15 15:53:10 UTC (rev 6273)
@@ -11,7 +11,7 @@
 use Carp ();
 use Config;
 
-our $VERSION = '1.003004'; # 1.3.4
+our $VERSION = '1.004000'; # 1.4.0
 
 sub import {
   my ($class, @args) = @_;
@@ -383,7 +383,7 @@
 the C<< use FindBin >> instructions in the "In code" sample above. If you did something like
 the above, you have a set of Perl modules at C<< ~/mydir1/lib >>. If you have a script at
 C<< ~/mydir1/scripts/myscript.pl >>, you need to tell it where to find the modules you installed 
-for it at C<< ~/mydir1/lib>>. 
+for it at C<< ~/mydir1/lib >>.
 
 In C<< ~/mydir1/scripts/myscript.pl >>:
 
@@ -610,11 +610,12 @@
 
 '--self-contained' feature contributed by Mark Stosberg <mark at summersault.com>.
 
-Doc patches for a custom local::lib patch contributed by Torsten Raudssus
+Doc patches for a custom local::lib directory contributed by Torsten Raudssus
 <torsten at raudssus.de>.
 
 Hans Dieter Pearcey <hdp at cpan.org> sent in some additional tests for ensuring
-things will install properly.
+things will install properly, and furthermore submitted a fix for the bug
+causing problems with writing Makefiles during bootstrapping. Many thanks!
 
 =head1 LICENSE