Skip to content

Commit

Permalink
Checking in changes prior to tagging of version 1.5014.
Browse files Browse the repository at this point in the history
Changelog diff is:

diff --git a/Changes b/Changes
index bf6a4b7..fa7e89c 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,11 @@
 See http://github.com/miyagawa/cpanminus/ for the latest development.

+1.5014 Tue Jun 12 18:27:02 PDT 2012
+   [Improvements]
+      - Make sure 'f' flag becomes the last for some tar versions (mst, aaronsw)
+      - Fixed warnings on perl 5.17+ (rjbs)
+      - Fix local::lib error message (berekuk)
+
 1.5013 Sat May 12 06:15:44 EEST 2012
    [Bug Fixes]
       - Fixed --cascade-search to seach for missing modules, which was broken by #150
  • Loading branch information
miyagawa committed Jun 13, 2012
1 parent fc65ded commit a93c7de
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
6 changes: 6 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
See http://github.com/miyagawa/cpanminus/ for the latest development.

1.5014 Tue Jun 12 18:27:02 PDT 2012
[Improvements]
- Make sure 'f' flag becomes the last for some tar versions (mst, aaronsw)
- Fixed warnings on perl 5.17+ (rjbs)
- Fix local::lib error message (berekuk)

1.5013 Sat May 12 06:15:44 EEST 2012
[Bug Fixes]
- Fixed --cascade-search to seach for missing modules, which was broken by #150
Expand Down
14 changes: 7 additions & 7 deletions cpanm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ my %fatpacked;

$fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';
package App::cpanminus;
our $VERSION = "1.5013";
our $VERSION = "1.5014";
=head1 NAME
Expand Down Expand Up @@ -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.5013";
our $VERSION = "1.5014";
my $quote = WIN32 ? q/"/ : q/'/;
Expand Down Expand Up @@ -833,7 +833,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
! - Configure local::lib your existing local::lib in this shell to set PERL_MM_OPT etc.
! - Install local::lib by running the following commands
!
! cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
! cpanm --local-lib=~/perl5 local::lib && eval \$(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
!
DIAG
sleep 2;
Expand Down Expand Up @@ -1900,7 +1900,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
$self->chat("Finding PREREQ from Makefile ...\n");
open my $mf, "Makefile";
while (<$mf>) {
if (/^\#\s+PREREQ_PM => {\s*(.*?)\s*}/) {
if (/^\#\s+PREREQ_PM => \{\s*(.*?)\s*\}/) {
my @all;
my @pairs = split ', ', $1;
for (@pairs) {
Expand Down Expand Up @@ -2184,17 +2184,17 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
$self->{_backends}{untar} = sub {
my($self, $tarfile) = @_;
my $xf = "xf" . ($self->{verbose} ? 'v' : '');
my $xf = ($self->{verbose} ? 'v' : '')."xf";
my $ar = $tarfile =~ /bz2$/ ? 'j' : 'z';
my($root, @others) = `$tar tf$ar $tarfile`
my($root, @others) = `$tar ${ar}tf $tarfile`
or return undef;
chomp $root;
$root =~ s!^\./!!;
$root =~ s{^(.+?)/.*$}{$1};
system "$tar $xf$ar $tarfile";
system "$tar $ar$xf $tarfile";
return $root if -d $root;
$self->diag_fail("Bad archive: $tarfile");
Expand Down
2 changes: 1 addition & 1 deletion lib/App/cpanminus.pm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package App::cpanminus;
our $VERSION = "1.5013";
our $VERSION = "1.5014";

=head1 NAME
Expand Down
2 changes: 1 addition & 1 deletion lib/App/cpanminus/script.pm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use Symbol ();
use constant WIN32 => $^O eq 'MSWin32';
use constant SUNOS => $^O eq 'solaris';

our $VERSION = "1.5013";
our $VERSION = "1.5014";

my $quote = WIN32 ? q/"/ : q/'/;

Expand Down

0 comments on commit a93c7de

Please sign in to comment.