From: apeiron <apeiron@bd8105ee-0ff8-0310-8827-fb3f25b6796d>
Date: Thu, 18 Feb 2010 10:40:05 +0000 (+0000)
Subject: Warnings for missing PATH/PERL5LIB (as when not running interactively) silenced
X-Git-Tag: 1.006009~48
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=03b91976440544f879e36dc1afc71bbf6a70d6e2;p=p5sagit%2Flocal-lib.git

Warnings for missing PATH/PERL5LIB (as when not running interactively) silenced
by a patch from Marco Emilio Poleggi.

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

diff --git a/Changes b/Changes
index 5431661..5a4341c 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for local::lib
 
+        - Warnings for missing PATH/PERL5LIB (as when not running interactively)
+          silenced by a patch from Marco Emilio Poleggi.
+
         - Start of better docs for C<--self-contained> thanks to
           markstos@cpan.org.
 
diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 1dd92a7..e1d521e 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -350,7 +350,7 @@ sub build_environment_vars_for {
     PERL5LIB => join($Config{path_sep},
                   $class->install_base_perl_path($path),
                   $class->install_base_arch_path($path),
-                  ($ENV{PERL5LIB} ?
+                  (($ENV{PERL5LIB}||()) ?
                     ($interpolate == INTERPOLATE_ENV
                       ? ($ENV{PERL5LIB})
                       : (($^O ne 'MSWin32') ? '$PERL5LIB' : '%PERL5LIB%' ))
@@ -359,7 +359,7 @@ sub build_environment_vars_for {
     PATH => join($Config{path_sep},
               $class->install_base_bin_path($path),
               ($interpolate == INTERPOLATE_ENV
-                ? $ENV{PATH}
+                ? ($ENV{PATH}||())
                 : (($^O ne 'MSWin32') ? '$PATH' : '%PATH%' ))
              ),
   )
@@ -809,6 +809,9 @@ section. Many thanks!
 
 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.
+
 =head1 COPYRIGHT
 
 Copyright (c) 2007 - 2009 the local::lib L</AUTHOR> and L</CONTRIBUTORS> as