From: matthewt <matthewt@bd8105ee-0ff8-0310-8827-fb3f25b6796d>
Date: Wed, 31 Mar 2010 16:23:40 +0000 (+0000)
Subject: delete broken --self-contained flag from core
X-Git-Tag: 1.006009~35
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1f8043c8ec158924f72e816a1b583c6dbc82465c;p=p5sagit%2Flocal-lib.git

delete broken --self-contained flag from core

git-svn-id: http://dev.catalyst.perl.org/repos/bast/local-lib/1.000/trunk@9072 bd8105ee-0ff8-0310-8827-fb3f25b6796d
---

diff --git a/Changes b/Changes
index 7ce7bd0..48812e5 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Revision history for local::lib
         - 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
 
diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 5764ce8..51c9ba7 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -12,13 +12,11 @@ use Carp ();
 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 @@ DEATH
   }
 
   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 @@ auto_install fixes kindly sponsored by http://www.takkle.com/
 Patches to correctly output commands for csh style shells, as well as some
 documentation additions, contributed by Christopher Nehren <apeiron@cpan.org>.
 
-'--self-contained' feature contributed by Mark Stosberg <mark@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@raudssus.de>.
 
@@ -812,6 +791,9 @@ Patch to add Win32 support contributed by Curtis Jewell <csjewell@cpan.org>.
 Warnings for missing PATH/PERL5LIB (as when not running interactively) silenced
 by a patch from Marco Emilio Poleggi.
 
+Mark Stosberg <mark@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
diff --git a/t/de-dup.t b/t/de-dup.t
index 51ef4f1..7763319 100644
--- a/t/de-dup.t
+++ b/t/de-dup.t
@@ -4,7 +4,7 @@ use Test::More;
 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 @@ local::lib->import($dir);
     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)';
-}
-