[carton] 102/472: rename install.json. Fix cpan default mirror

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro-guest pushed a commit to branch master
in repository carton.

commit c58ac7e57ee8b3a9464d9e84b8d388ea10a50129
Author: Tatsuhiko Miyagawa <miyag...@bulknews.net>
Date:   Thu Oct 13 09:48:28 2011 +0900

    rename install.json. Fix cpan default mirror
---
 lib/Carton.pm        | 16 ++++++++--------
 lib/Carton/Config.pm |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Carton.pm b/lib/Carton.pm
index be7a15b..58992eb 100644
--- a/lib/Carton.pm
+++ b/lib/Carton.pm
@@ -12,7 +12,7 @@ use Carton::Util;
 use File::Path;
 
 use constant CARTON_LOCK_VERSION => '0.9';
-our $DefaultMirror = 'http://cpan.cpantesters.org/';
+our $DefaultMirror = 'http://cpan.metacpan.org/';
 
 sub new {
     my($class, %args) = @_;
@@ -285,15 +285,15 @@ sub update_lock_file {
 sub build_lock {
     my $self = shift;
 
-    my %locals = $self->find_locals;
+    my %installs = $self->find_installs;
 
     return {
-        modules => \%locals,
+        modules => \%installs,
         version => CARTON_LOCK_VERSION,
     };
 }
 
-sub find_locals {
+sub find_installs {
     my $self = shift;
 
     require File::Find;
@@ -301,15 +301,15 @@ sub find_locals {
     my $libdir = $self->config->get(key => 'environment.path') . 
"/lib/perl5/auto/meta";
     return unless -e $libdir;
 
-    my @locals;
+    my @installs;
     my $wanted = sub {
-        if ($_ eq 'local.json') {
-            push @locals, $File::Find::name;
+        if ($_ eq 'install.json') {
+            push @installs, $File::Find::name;
         }
     };
     File::Find::find($wanted, $libdir);
 
-    return map { my $module = Carton::Util::load_json($_); ($module->{name} => 
$module) } @locals;
+    return map { my $module = Carton::Util::load_json($_); ($module->{name} => 
$module) } @installs;
 }
 
 sub check_satisfies {
diff --git a/lib/Carton/Config.pm b/lib/Carton/Config.pm
index 7c8cf76..abc9370 100644
--- a/lib/Carton/Config.pm
+++ b/lib/Carton/Config.pm
@@ -20,7 +20,7 @@ sub load_defaults {
     my @defaults = (
         [ 'environment', 'path' => 'local' ],
         [ 'cpanm', 'path' => 'cpanm' ],
-        [ 'cpanm', 'mirror' => 'http://cpan.cpantesters.org' ],
+        [ 'cpanm', 'mirror' => 'http://cpan.metacpan.org/' ],
     );
 
     for my $default (@defaults) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/carton.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits