From: Graham Knop <haarg@haarg.org>
Date: Sat, 21 Sep 2013 11:06:19 +0000 (-0400)
Subject: don't try to remove arch dirs from environment, they aren't added anymore
X-Git-Tag: v2.000_000~50
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=2164a41e042df0146858507fc2443da2d91f3ffe

don't try to remove arch dirs from environment, they aren't added anymore
---

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index ad7b15f..f68cc76 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -486,7 +486,6 @@ sub build_deactivate_environment_vars_for {
   }
 
   my $perl_path = $class->install_base_perl_path($path);
-  my $arch_path = $class->install_base_arch_path($path);
   my $bin_path = $class->install_base_bin_path($path);
 
 
@@ -501,7 +500,7 @@ sub build_deactivate_environment_vars_for {
       {
         exists => 0,
         filter => sub {
-          $_ ne $perl_path && $_ ne $arch_path
+          $_ ne $perl_path
         },
       },
       \'PERL5LIB',
@@ -533,7 +532,6 @@ sub build_deact_all_environment_vars_for {
 
   my %perl_paths = map { (
       $class->install_base_perl_path($_) => 1,
-      $class->install_base_arch_path($_) => 1
     ) } @active_lls;
   my %bin_paths = map { (
       $class->install_base_bin_path($_) => 1,