r74245 - in /branches/upstream/cpanminus/current: Changes MANIFEST META.json META.yml bin/cpanm lib/App/cpanminus.pm
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Thu May 12 14:06:45 UTC 2011
Author: ghedo-guest
Date: Thu May 12 14:05:22 2011
New Revision: 74245
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74245
Log:
[svn-upgrade] new version cpanminus (1.4005)
Added:
branches/upstream/cpanminus/current/META.json
Modified:
branches/upstream/cpanminus/current/Changes
branches/upstream/cpanminus/current/MANIFEST
branches/upstream/cpanminus/current/META.yml
branches/upstream/cpanminus/current/bin/cpanm
branches/upstream/cpanminus/current/lib/App/cpanminus.pm
Modified: branches/upstream/cpanminus/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/Changes?rev=74245&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/Changes (original)
+++ branches/upstream/cpanminus/current/Changes Thu May 12 14:05:22 2011
@@ -1,4 +1,11 @@
See http://github.com/miyagawa/cpanminus/ for the latest development.
+
+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
+ - Ignore Module::CoreList loading errors with -L on perl < 5.8.9
+ - Fixed --prompt in combination with --quest RT:66602
+ - Fixed a broken Bundle:: module installation
1.4004 Thu Mar 10 10:04:28 PST 2011
[Incompatible Changes]
Modified: branches/upstream/cpanminus/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/MANIFEST?rev=74245&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/MANIFEST (original)
+++ branches/upstream/cpanminus/current/MANIFEST Thu May 12 14:05:22 2011
@@ -5,4 +5,5 @@
README
lib/App/cpanminus.pm
t/happy_cpantesters.t
-META.yml Module meta-data (added by MakeMaker)
+META.yml Module YAML meta-data (added by MakeMaker)
+META.json Module JSON meta-data (added by MakeMaker)
Added: branches/upstream/cpanminus/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/META.json?rev=74245&op=file
==============================================================================
--- branches/upstream/cpanminus/current/META.json (added)
+++ branches/upstream/cpanminus/current/META.json Thu May 12 14:05:22 2011
@@ -1,0 +1,43 @@
+{
+ "abstract" : "Get, unpack, build and install modules from CPAN.",
+ "author" : [
+ "unknown"
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "ExtUtils::MakeMaker version 6.5707, CPAN::Meta::Converter version 2.110930",
+ "license" : [
+ "perl_5"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+ "version" : "2"
+ },
+ "name" : "App-cpanminus",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : 0
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : 0
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "ExtUtils::Install" : "1.46",
+ "ExtUtils::MakeMaker" : "6.31",
+ "Module::Build" : "0.36"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "version" : "1.4005"
+}
Modified: branches/upstream/cpanminus/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/META.yml?rev=74245&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/META.yml (original)
+++ branches/upstream/cpanminus/current/META.yml Thu May 12 14:05:22 2011
@@ -1,23 +1,24 @@
---- #YAML:1.0
-name: App-cpanminus
-version: 1.4004
-abstract: Get, unpack, build and install modules from CPAN.
-author: []
-license: perl
-distribution_type: module
+---
+abstract: 'Get, unpack, build and install modules from CPAN.'
+author:
+ - unknown
+build_requires:
+ ExtUtils::MakeMaker: 0
configure_requires:
- ExtUtils::MakeMaker: 0
-build_requires:
- ExtUtils::MakeMaker: 0
+ ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.5707, CPAN::Meta::Converter version 2.110930'
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: App-cpanminus
+no_index:
+ directory:
+ - t
+ - inc
requires:
- ExtUtils::Install: 1.46
- ExtUtils::MakeMaker: 6.31
- Module::Build: 0.36
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.56
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ ExtUtils::Install: 1.46
+ ExtUtils::MakeMaker: 6.31
+ Module::Build: 0.36
+version: 1.4005
Modified: branches/upstream/cpanminus/current/bin/cpanm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/bin/cpanm?rev=74245&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/bin/cpanm (original)
+++ branches/upstream/cpanminus/current/bin/cpanm Thu May 12 14:05:22 2011
@@ -18,7 +18,7 @@
$fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';
package App::cpanminus;
- our $VERSION = "1.4004";
+ our $VERSION = "1.4005";
=head1 NAME
@@ -73,7 +73,7 @@
to install the C<cpanm> executable to the perl's bin path, like
C<~/perl5/perlbrew/bin/cpanm>.
- =head2 Downloaing the standalone executable
+ =head2 Downloading the standalone executable
You can also copy the standalone executable to whatever location you'd like.
@@ -314,7 +314,7 @@
use constant WIN32 => $^O eq 'MSWin32';
use constant SUNOS => $^O eq 'solaris';
- our $VERSION = "1.4004";
+ our $VERSION = "1.4005";
my $quote = WIN32 ? q/"/ : q/'/;
@@ -497,9 +497,10 @@
};
}
- open my $out, ">$self->{log}" or die "$self->{log}: $!";
- print $out "cpanm (App::cpanminus) $VERSION on perl $] built for $Config{archname}\n";
- print $out "Work directory is $self->{base}\n";
+ { open my $out, ">$self->{log}" or die "$self->{log}: $!" }
+
+ $self->chat("cpanm (App::cpanminus) $VERSION on perl $] built for $Config{archname}\n" .
+ "Work directory is $self->{base}\n");
}
sub fetch_meta_sco {
@@ -807,6 +808,8 @@
my @inc = $self->_core_only_inc($base);
$self->_dump_inc(\@inc, \@INC);
$self->{search_inc} = [ @inc ];
+ } else {
+ $self->{search_inc} = [ $base, @INC ];
}
$self->_setup_local_lib_env($base);
}
@@ -836,7 +839,7 @@
my $dispdef = defined $def ? "[$def] " : " ";
$def = defined $def ? $def : "";
- if ($self->{quiet} || !$self->{prompt} || (!$isa_tty && eof STDIN)) {
+ if (!$self->{prompt} || (!$isa_tty && eof STDIN)) {
return $def;
}
@@ -1340,8 +1343,10 @@
# When -L is in use, the version loaded from 'perl' library path
# might be newer than the version that is shipped with the current perl
if ($self->{self_contained} && $self->loaded_from_perl_lib($meta)) {
- require Module::CoreList;
- my $core_version = $Module::CoreList::version{$]+0}{$mod};
+ my $core_version = eval {
+ require Module::CoreList;
+ $Module::CoreList::version{$]+0}{$mod};
+ };
# HACK: Module::Build 0.3622 or later has non-core module
# dependencies such as Perl::OSType and CPAN::Meta, and causes
@@ -1352,7 +1357,7 @@
return 0, undef;
}
- $version = $core_version;
+ $version = $core_version if $core_version;
}
$self->{local_versions}{$mod} = $version;
@@ -1635,9 +1640,6 @@
my($self, $dist) = @_;
my @deps;
- if ($dist->{module} =~ /^Bundle::/i) {
- push @deps, $self->bundle_deps($dist);
- }
my $meta = $dist->{meta};
if (-e 'MYMETA.yml') {
@@ -1670,6 +1672,10 @@
last;
}
}
+ }
+
+ if ($dist->{module} =~ /^Bundle::/i) {
+ push @deps, $self->bundle_deps($dist);
}
# No need to remove, but this gets in the way of signature testing :/
Modified: branches/upstream/cpanminus/current/lib/App/cpanminus.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/cpanminus/current/lib/App/cpanminus.pm?rev=74245&op=diff
==============================================================================
--- branches/upstream/cpanminus/current/lib/App/cpanminus.pm (original)
+++ branches/upstream/cpanminus/current/lib/App/cpanminus.pm Thu May 12 14:05:22 2011
@@ -1,5 +1,5 @@
package App::cpanminus;
-our $VERSION = "1.4004";
+our $VERSION = "1.4005";
=head1 NAME
@@ -54,7 +54,7 @@
to install the C<cpanm> executable to the perl's bin path, like
C<~/perl5/perlbrew/bin/cpanm>.
-=head2 Downloaing the standalone executable
+=head2 Downloading the standalone executable
You can also copy the standalone executable to whatever location you'd like.
More information about the Pkg-perl-cvs-commits
mailing list