[carton] 81/472: If a custom mirror is set, skip cpanmetadb with --mirror-only. Fixes #18

[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 32c6a86c8dcc1746ae973629fbde1808dd62122f
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Wed Jun 29 22:45:47 2011 -0400

    If a custom mirror is set, skip cpanmetadb with --mirror-only. Fixes #18
---
 lib/Carton.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Carton.pm b/lib/Carton.pm
index c0c7bd1..d483cf9 100644
--- a/lib/Carton.pm
+++ b/lib/Carton.pm
@@ -11,6 +11,8 @@ use Carton::Config;
 use Carton::Util;
 use File::Path;
 
+our $DefaultMirror = 'http://cpan.cpantesters.org/';
+
 sub new {
     my($class, %args) = @_;
     bless {
@@ -94,10 +96,13 @@ sub install_conservative {
         $self->build_mirror_file($index, $self->{mirror_file});
     }
 
+    my $mirror = $self->config->get('mirror') || $DefaultMirror;
+
     $self->run_cpanm(
         "--skip-satisfied",
-        "--mirror", $self->config->get('mirror') || 'http://cpan.cpantesters.org/',
-        "--mirror", "http://backpan.perl.org/",     # fallback
+        "--mirror", $mirror,
+        "--mirror", "http://backpan.perl.org/", # fallback
+        ( $mirror ne $DefaultMirror ? "--mirror-only" : () ),
         ( $self->lock ? ("--mirror-index", $self->{mirror_file}) : () ),
         ( $cascade ? "--cascade-search" : () ),
         @$modules,

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