From 61a39097f0b061bf8bdefdb5d23137255d1c8cf5 Mon Sep 17 00:00:00 2001 From: Tatsuhiko Miyagawa Date: Fri, 20 Aug 2010 12:47:02 -0700 Subject: [PATCH] Checking in changes prior to tagging of version 1.0012. Changelog diff is: diff --git a/Changes b/Changes index f7e60d2..24a55b9 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ See http://github.com/miyagawa/cpanminus/ for the latest development. +1.0012 Fri Aug 20 12:46:34 PDT 2010 + - version check with -L and -l was failing with --skip-installed default. Now fixed (reported by leedo) #55 + - Fixed the code to find root of tarballs (perlpilot) + 1.0011 Wed Aug 18 16:38:24 PDT 2010 - -f now implies --reinstall (perigrin) --- Changes | 4 ++++ cpanm | 7 ++++--- lib/App/cpanminus.pm | 2 +- lib/App/cpanminus/script.pm | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index f7e60d2ad..24a55b902 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ See http://github.com/miyagawa/cpanminus/ for the latest development. +1.0012 Fri Aug 20 12:46:34 PDT 2010 + - version check with -L and -l was failing with --skip-installed default. Now fixed (reported by leedo) #55 + - Fixed the code to find root of tarballs (perlpilot) + 1.0011 Wed Aug 18 16:38:24 PDT 2010 - -f now implies --reinstall (perigrin) diff --git a/cpanm b/cpanm index 3974f1881..dcd26f9f7 100755 --- a/cpanm +++ b/cpanm @@ -18,7 +18,7 @@ my %fatpacked; $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS'; package App::cpanminus; - our $VERSION = "1.0011"; + our $VERSION = "1.0012"; =head1 NAME @@ -336,7 +336,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT'; use constant WIN32 => $^O eq 'MSWin32'; use constant SUNOS => $^O eq 'solaris'; - our $VERSION = "1.0011"; + our $VERSION = "1.0012"; $VERSION = eval $VERSION; my $quote = WIN32 ? q/"/ : q/'/; @@ -981,6 +981,8 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT'; return 1; } + $self->check_libs; + if ($dist->{module}) { my($ok, $local) = $self->check_module($dist->{module}, $dist->{module_version} || 0); if ($self->{skip_installed} && $ok) { @@ -1010,7 +1012,6 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT'; return 1; } - $self->check_libs; return $self->build_stuff($module, $dist, $depth); } diff --git a/lib/App/cpanminus.pm b/lib/App/cpanminus.pm index 75b662ad7..cf232ce23 100644 --- a/lib/App/cpanminus.pm +++ b/lib/App/cpanminus.pm @@ -1,5 +1,5 @@ package App::cpanminus; -our $VERSION = "1.0011"; +our $VERSION = "1.0012"; =head1 NAME diff --git a/lib/App/cpanminus/script.pm b/lib/App/cpanminus/script.pm index 978c4a4c5..d9fdce4c8 100644 --- a/lib/App/cpanminus/script.pm +++ b/lib/App/cpanminus/script.pm @@ -12,7 +12,7 @@ use Parse::CPAN::Meta; use constant WIN32 => $^O eq 'MSWin32'; use constant SUNOS => $^O eq 'solaris'; -our $VERSION = "1.0011"; +our $VERSION = "1.0012"; $VERSION = eval $VERSION; my $quote = WIN32 ? q/"/ : q/'/;