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

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2010-03-31 17:23:40 +0100 (Wed, 31 Mar 2010)
New Revision: 9072

Modified:
   local-lib/1.000/trunk/Changes
   local-lib/1.000/trunk/lib/local/lib.pm
   local-lib/1.000/trunk/t/de-dup.t
Log:
delete broken --self-contained flag from core

Modified: local-lib/1.000/trunk/Changes
===================================================================
--- local-lib/1.000/trunk/Changes	2010-03-31 16:12:02 UTC (rev 9071)
+++ local-lib/1.000/trunk/Changes	2010-03-31 16:23:40 UTC (rev 9072)
@@ -3,6 +3,7 @@
         - Create lib::core::only that provides the "set @INC to core dirs
           only" functionality that was the only part of --self-contained that
           ever worked usefully.
+        - Delete broken --self-contained flag from core
 
 1.005001 2010-03-10
 

Modified: local-lib/1.000/trunk/lib/local/lib.pm
===================================================================
--- local-lib/1.000/trunk/lib/local/lib.pm	2010-03-31 16:12:02 UTC (rev 9071)
+++ local-lib/1.000/trunk/lib/local/lib.pm	2010-03-31 16:23:40 UTC (rev 9072)
@@ -12,13 +12,11 @@
 use Config;
 
 our $VERSION = '1.005001'; # 1.5.1
-my @KNOWN_FLAGS = (qw/--self-contained/);
 
+our @KNOWN_FLAGS = qw(--self-contained);
+
 sub import {
   my ($class, @args) = @_;
-  @args <= 1 + @KNOWN_FLAGS or die <<'DEATH';
-Please see `perldoc local::lib` for directions on using this module.
-DEATH
 
   # Remember what PERL5LIB was when we started
   my $perl5lib = $ENV{PERL5LIB} || '';
@@ -50,21 +48,7 @@
   }
 
   if($arg_store{'self-contained'}) {
-    # The only directories that remain are those that we just defined and those
-    # where core modules are stored.  We put PERL5LIB first, so it'll be favored
-    # over privlibexp and archlibexp
-
-    @INC = _uniq(
-      $class->install_base_perl_path($arg_store{path}),
-      $class->install_base_arch_path($arg_store{path}),
-      split( $Config{path_sep}, $perl5lib ),
-      $Config::Config{privlibexp},
-      $Config::Config{archlibexp}
-    );
-
-    # We explicitly set PERL5LIB here to the above de-duped list to prevent
-    # @INC from growing with each invocation
-    $ENV{PERL5LIB} = join( $Config{path_sep}, @INC );
+    die "FATAL: The local::lib --self-contained flag has never worked reliably and the original author, Mark Stosberg, was unable or unwilling to maintain it. As such, this flag has been removed from the local::lib codebase in order to prevent misunderstandings and potentially broken builds. The local::lib authors recommend that you look at the lib::core::only module shipped with this distribution in order to create a more robust environment that is equivalent to what --self-contained provided (although quite possibly not what you originally thought it provided due to the poor quality of the documentation, for which we apologise).\n";
   }
 
   $arg_store{path} = $class->resolve_path($arg_store{path});
@@ -790,11 +774,6 @@
 Patches to correctly output commands for csh style shells, as well as some
 documentation additions, contributed by Christopher Nehren <apeiron at cpan.org>.
 
-'--self-contained' feature contributed by Mark Stosberg <mark at summersault.com>.
-
-Ability to pass '--self-contained' without a directory inspired by frew on
-irc.perl.org/#catalyst.
-
 Doc patches for a custom local::lib directory contributed by Torsten Raudssus
 <torsten at raudssus.de>.
 
@@ -812,6 +791,9 @@
 Warnings for missing PATH/PERL5LIB (as when not running interactively) silenced
 by a patch from Marco Emilio Poleggi.
 
+Mark Stosberg <mark at summersault.com> provided the code for the now deleted
+'--self-contained' option.
+
 =head1 COPYRIGHT
 
 Copyright (c) 2007 - 2009 the local::lib L</AUTHOR> and L</CONTRIBUTORS> as

Modified: local-lib/1.000/trunk/t/de-dup.t
===================================================================
--- local-lib/1.000/trunk/t/de-dup.t	2010-03-31 16:12:02 UTC (rev 9071)
+++ local-lib/1.000/trunk/t/de-dup.t	2010-03-31 16:23:40 UTC (rev 9072)
@@ -4,7 +4,7 @@
 use File::Temp qw(tempdir);
 use Cwd;
 
-plan tests => 4;
+plan tests => 2;
 
 my $dir = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP => 1);
 
@@ -19,14 +19,3 @@
     ok ! grep({ $inc{$_} > 1 } keys %inc), '@INC entries not duplicated';
     ok ! grep({ $perl5lib{$_} > 1 } keys %perl5lib), 'ENV{PERL5LIB} entries not duplicated';
 }
-
-local::lib->import('--self-contained', $dir);
-
-{
-    my (%inc, %perl5lib);
-    map { $inc{$_}++ } @INC;
-    map { $perl5lib{$_} } split /:/, $ENV{PERL5LIB};
-    ok ! grep({ $inc{$_} > 1 } keys %inc), '@INC entries not duplicated (--self-contained)';
-    ok ! grep({ $perl5lib{$_} > 1 } keys %perl5lib), 'ENV{PERL5LIB} entries not duplicated (--self-contained)';
-}
-