[carton] 232/472: Stop collection dependencies when installing/bundling because cpanfile can be directly used by --installdeps .

[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 e3cb508cc8166b378c1ebab52b13005cc8aae2fe
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Fri May 31 14:27:58 2013 +0900

    Stop collection dependencies when installing/bundling because cpanfile can be directly used by --installdeps .
---
 lib/Carton.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/Carton.pm b/lib/Carton.pm
index c0c2b50..11eabb7 100644
--- a/lib/Carton.pm
+++ b/lib/Carton.pm
@@ -54,7 +54,6 @@ sub list_dependencies {
 sub bundle {
     my($self, $cpanfile, $lock) = @_;
 
-    my @modules = $self->list_dependencies;
     $lock->write_index($self->{mirror_file});
 
     my $mirror = $self->{mirror} || $DefaultMirror;
@@ -69,15 +68,14 @@ sub bundle {
         "--cascade-search",
         ( $mirror ne $DefaultMirror ? "--mirror-only" : () ),
         "--save-dists", $local_cache,
-        @modules,
+        "--installdeps", ".",
     );
 }
 
 sub install {
     my($self, $file, $lock, $cascade) = @_;
 
-    my @modules = $self->list_dependencies;
-
+    # TODO merge CPANfile git to mirror even if lock doesn't exist
     if ($lock) {
         $lock->write_index($self->{mirror_file});
     }
@@ -97,7 +95,7 @@ sub install {
         ( $is_default_mirror ? () : "--mirror-only" ),
         ( $lock ? ("--mirror-index", $self->{mirror_file}) : () ),
         ( $cascade ? "--cascade-search" : () ),
-        @modules,
+        "--installdeps", ".",
     ) or die "Installing modules failed\n";
 }
 

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