r74247 - in /trunk/cpanminus: Changes MANIFEST META.json META.yml bin/cpanm debian/changelog debian/control lib/App/cpanminus.pm
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Thu May 12 14:10:57 UTC 2011
Author: ghedo-guest
Date: Thu May 12 14:10:21 2011
New Revision: 74247
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74247
Log:
* New upstream release
* Bump Standards-Version to 3.9.2 (no changes needed)
Added:
trunk/cpanminus/META.json
- copied unchanged from r74246, branches/upstream/cpanminus/current/META.json
Modified:
trunk/cpanminus/Changes
trunk/cpanminus/MANIFEST
trunk/cpanminus/META.yml
trunk/cpanminus/bin/cpanm
trunk/cpanminus/debian/changelog
trunk/cpanminus/debian/control
trunk/cpanminus/lib/App/cpanminus.pm
Modified: trunk/cpanminus/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/Changes?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/Changes (original)
+++ trunk/cpanminus/Changes Thu May 12 14:10:21 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: trunk/cpanminus/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/MANIFEST?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/MANIFEST (original)
+++ trunk/cpanminus/MANIFEST Thu May 12 14:10:21 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)
Modified: trunk/cpanminus/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/META.yml?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/META.yml (original)
+++ trunk/cpanminus/META.yml Thu May 12 14:10:21 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: trunk/cpanminus/bin/cpanm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/bin/cpanm?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/bin/cpanm (original)
+++ trunk/cpanminus/bin/cpanm Thu May 12 14:10:21 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: trunk/cpanminus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/debian/changelog?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/debian/changelog (original)
+++ trunk/cpanminus/debian/changelog Thu May 12 14:10:21 2011
@@ -1,3 +1,10 @@
+cpanminus (1.4005-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.9.2 (no changes needed)
+
+ -- Alessandro Ghedini <al3xbio at gmail.com> Thu, 12 May 2011 16:07:21 +0200
+
cpanminus (1.4004-1) unstable; urgency=low
* New upstream release
Modified: trunk/cpanminus/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/debian/control?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/debian/control (original)
+++ trunk/cpanminus/debian/control Thu May 12 14:10:21 2011
@@ -5,7 +5,7 @@
Build-Depends-Indep: perl, perl (>= 5.10.1) | libextutils-install-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Alessandro Ghedini <al3xbio at gmail.com>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://search.cpan.org/dist/App-cpanminus/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/cpanminus/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/cpanminus/
Modified: trunk/cpanminus/lib/App/cpanminus.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/cpanminus/lib/App/cpanminus.pm?rev=74247&op=diff
==============================================================================
--- trunk/cpanminus/lib/App/cpanminus.pm (original)
+++ trunk/cpanminus/lib/App/cpanminus.pm Thu May 12 14:10:21 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