This is an automated email from the git hooks/post-receive script. kanashiro-guest pushed a commit to branch master in repository carton.
commit e155ca844e6f4e0168bbef48f3843e0f4b6e15e5 Author: Tatsuhiko Miyagawa <miyag...@bulknews.net> Date: Thu May 30 16:37:00 2013 +0900 Simplify install methods --- lib/Carton.pm | 17 +++++------------ lib/Carton/CLI.pm | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/Carton.pm b/lib/Carton.pm index a7f78bc..af9763d 100644 --- a/lib/Carton.pm +++ b/lib/Carton.pm @@ -36,14 +36,6 @@ sub lock { $_[0]->{lock} } sub local_mirror { File::Spec->rel2abs("$_[0]->{path}/cache") } -sub install_from_cpanfile { - my($self, $file, $cascade) = @_; - - my @modules = $self->list_dependencies; - $self->install_conservative(\@modules, $cascade) - or die "Installing modules failed\n"; -} - sub list_dependencies { my $self = shift; @@ -100,10 +92,11 @@ sub download_from_cpanfile { ); } -sub install_conservative { - my($self, $modules, $cascade) = @_; +sub install { + my($self, $file, $cascade) = @_; - $modules = $self->dedupe_modules($modules); + my @modules = $self->list_dependencies; + my $modules = $self->dedupe_modules(\@modules); if ($self->lock) { my $index = $self->build_index($self->lock->{modules}); @@ -126,7 +119,7 @@ sub install_conservative { ( $self->lock ? ("--mirror-index", $self->{mirror_file}) : () ), ( $cascade ? "--cascade-search" : () ), @$modules, - ); + ) or die "Installing modules failed\n"; } sub build_mirror_file { diff --git a/lib/Carton/CLI.pm b/lib/Carton/CLI.pm index abfe155..3950f51 100644 --- a/lib/Carton/CLI.pm +++ b/lib/Carton/CLI.pm @@ -178,10 +178,10 @@ sub cmd_install { if ($self->{deployment}) { $self->print("Installing modules using $cpanfile (deployment mode)\n"); - $self->carton->install_from_cpanfile($cpanfile); + $self->carton->install($cpanfile); } else { $self->print("Installing modules using $cpanfile\n"); - $self->carton->install_from_cpanfile($cpanfile, 1); + $self->carton->install($cpanfile, 1); $self->carton->update_lock_file($self->lock_file); } -- 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