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

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2007-09-17 21:57:39 +0100 (Mon, 17 Sep 2007)
New Revision: 3756

Modified:
   local-lib/1.000/trunk/Makefile.PL
Log:
stupid hack to deal with CPAN.pm setting PERL5_CPANPLUS_IS_RUNNING env var

Modified: local-lib/1.000/trunk/Makefile.PL
===================================================================
--- local-lib/1.000/trunk/Makefile.PL	2007-09-17 20:20:58 UTC (rev 3755)
+++ local-lib/1.000/trunk/Makefile.PL	2007-09-17 20:57:39 UTC (rev 3756)
@@ -50,6 +50,16 @@
 requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
 requires 'CPAN' => '1.80'; # sudo support
 
+# No, really. See
+# https://rt.cpan.org/Public/Bug/Display.html?id=23735
+# for why CPAN now sets the CPANPLUS env var.
+# trouble is this means we can't auto_install(_now) CPAN itself
+# without this beautiful hack
+
+my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
+require CPAN;
+delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
+
 if ($bootstrapping) {
   auto_install_now;
 } else {