Checking in changes prior to tagging of version 1.4006.

Changelog diff is: diff --git a/Changes b/Changes index 9341ec0..6c64113 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ See http://github.com/miyagawa/cpanminus/ for the latest development. +1.4006 Mon May 16 10:02:45 PDT 2011 + [Bug Fixes] + - Proper fix for the -l option installing the same modules + 1.4005 Wed May 11 12:05:49 PDT 2011 [Bug Fixes] - -l should now correctly locate installed modules to skip reinstalling. Regression in 1.4004
miyagawa · May 16, 2011 · 14882fd · 14882fd
1 parent 1888ee1
commit 14882fd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 META.yml
+MYMETA.*
 Makefile
 inc/
 pm_to_blib

diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 See http://github.com/miyagawa/cpanminus/ for the latest development.
 
+1.4006 Mon May 16 10:02:45 PDT 2011
+   [Bug Fixes]
+      - Proper fix for the -l option installing the same modules
+
 1.4005 Wed May 11 12:05:49 PDT 2011
    [Bug Fixes]
       - -l should now correctly locate installed modules to skip reinstalling. Regression in 1.4004

diff --git a/cpanm b/cpanm
@@ -18,7 +18,7 @@ my %fatpacked;
 
 $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';
   package App::cpanminus;
-  our $VERSION = "1.4005";
+  our $VERSION = "1.4006";
   
   =head1 NAME
   
@@ -314,7 +314,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
   use constant WIN32 => $^O eq 'MSWin32';
   use constant SUNOS => $^O eq 'solaris';
   
-  our $VERSION = "1.4005";
+  our $VERSION = "1.4006";
   
   my $quote = WIN32 ? q/"/ : q/'/;
   
@@ -809,7 +809,11 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
               $self->_dump_inc(\@inc, \@INC);
               $self->{search_inc} = [ @inc ];
           } else {
-              $self->{search_inc} = [ $base, @INC ];
+              $self->{search_inc} = [
+                  local::lib->install_base_arch_path($base),
+                  local::lib->install_base_perl_path($base),
+                  @INC,
+              ];
           }
           $self->_setup_local_lib_env($base);
       }

diff --git a/lib/App/cpanminus.pm b/lib/App/cpanminus.pm
@@ -1,5 +1,5 @@
 package App::cpanminus;
-our $VERSION = "1.4005";
+our $VERSION = "1.4006";
 
 =head1 NAME
 

diff --git a/lib/App/cpanminus/script.pm b/lib/App/cpanminus/script.pm
@@ -14,7 +14,7 @@ use Symbol ();
 use constant WIN32 => $^O eq 'MSWin32';
 use constant SUNOS => $^O eq 'solaris';
 
-our $VERSION = "1.4005";
+our $VERSION = "1.4006";
 
 my $quote = WIN32 ? q/"/ : q/'/;