Permalink
Browse files

Checking in changes prior to tagging of version 1.5009.

Changelog diff is:

diff --git a/Changes b/Changes
index 6f062ca..ad08cbc 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 See http://github.com/miyagawa/cpanminus/ for the latest development.

+1.5009 Fri Mar 30 18:44:12 CEST 2012
+   [Bug Fixes]
+      - Fixed a bug where URL containing ~ (childe) fails to install #134
+      - Fixed a bug where install.json contains bogus data when you specify dist paths
+
 1.5008 Sat Mar 17 18:19:57 PDT 2012
    [Bug Fixes]
       - Fied a bug where `cpanm Foo` doesn't properly activate local::lib during installs
  • Loading branch information...
1 parent 100e90a commit e1bb85bf470eec6bd1df2ecaeebeea72c21c33ae @miyagawa committed Mar 30, 2012
Showing with 12 additions and 7 deletions.
  1. +5 −0 Changes
  2. +5 −5 cpanm
  3. +1 −1 lib/App/cpanminus.pm
  4. +1 −1 lib/App/cpanminus/script.pm
View
@@ -1,5 +1,10 @@
See http://github.com/miyagawa/cpanminus/ for the latest development.
+1.5009 Fri Mar 30 18:44:12 CEST 2012
+ [Bug Fixes]
+ - Fixed a bug where URL containing ~ (childe) fails to install #134
+ - Fixed a bug where install.json contains bogus data when you specify dist paths
+
1.5008 Sat Mar 17 18:19:57 PDT 2012
[Bug Fixes]
- Fied a bug where `cpanm Foo` doesn't properly activate local::lib during installs
View
10 cpanm
@@ -18,7 +18,7 @@ my %fatpacked;
$fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';
package App::cpanminus;
- our $VERSION = "1.5008";
+ our $VERSION = "1.5009";
=head1 NAME
@@ -326,7 +326,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
use constant WIN32 => $^O eq 'MSWin32';
use constant SUNOS => $^O eq 'solaris';
- our $VERSION = "1.5008";
+ our $VERSION = "1.5009";
my $quote = WIN32 ? q/"/ : q/'/;
@@ -477,7 +477,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
$module = join '::', grep { $_ } File::Spec->splitdir($dirs), $file;
}
- ($module, my $version) = split /\~/, $module, 2;
+ ($module, my $version) = split /\~/, $module, 2 if $module =~ /\~[\d\._]+$/;
if ($self->{skip_satisfied} or defined $version) {
$self->check_libs;
my($ok, $local) = $self->check_module($module, $version || 0);
@@ -1772,8 +1772,8 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
my $local = {
name => $module_name,
- module => $module,
- version => $provides->{$module}{version} || $dist->{version},
+ target => $module,
+ version => $provides->{$module_name}{version} || $dist->{version},
dist => $dist->{distvname},
pathname => $dist->{pathname},
provides => $provides,
View
@@ -1,5 +1,5 @@
package App::cpanminus;
-our $VERSION = "1.5008";
+our $VERSION = "1.5009";
=head1 NAME
@@ -14,7 +14,7 @@ use Symbol ();
use constant WIN32 => $^O eq 'MSWin32';
use constant SUNOS => $^O eq 'solaris';
-our $VERSION = "1.5008";
+our $VERSION = "1.5009";
my $quote = WIN32 ? q/"/ : q/'/;

0 comments on commit e1bb85b

Please sign in to comment.