I apparently never actually committed these files. o_O

[p5sagit/local-lib.git] / lib / local / lib.pm

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 6b1f5f9..128648c 100644 (file)
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -11,7 +11,7 @@ use File::Path ();
 use Carp ();
 use Config;
 
-our $VERSION = '1.004008'; # 1.4.7
+our $VERSION = '1.004009'; # 1.4.9
 my @KNOWN_FLAGS = (qw/--self-contained/);
 
 sub import {
@@ -21,7 +21,7 @@ Please see `perldoc local::lib` for directions on using this module.
 DEATH
 
   # Remember what PERL5LIB was when we started
-  my $perl5lib = $ENV{PERL5LIB};
+  my $perl5lib = $ENV{PERL5LIB} || '';
 
   my %arg_store;
   for my $arg (@args) {
@@ -157,11 +157,7 @@ sub resolve_home_path {
   my ($user) = ($path =~ /^~([^\/]+)/); # can assume ^~ so undef for 'us'
   my $tried_file_homedir;
   my $homedir = do {
-    if (
-        eval { require File::HomeDir }
-        # Use CPAN::Version if available as it deals correctly with dev releases
-        && (eval { require CPAN::Version; } ? CPAN::Version->vgt($File::HomeDir::VERSION, 0.65) : $File::HomeDir::VERSION >= 0.65
-    )) {
+    if (eval { require File::HomeDir } && $File::HomeDir::VERSION >= 0.65) {
       $tried_file_homedir = 1;
       if (defined $user) {
         File::HomeDir->users_home($user);