[carton] 18/472: Add back the ability to install modules from cmdline arg

[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 08d6be0e82cde02f94c87a68723a57b73494077e
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Sat Jun 25 20:01:25 2011 -0700

    Add back the ability to install modules from cmdline arg
---
 lib/Carton.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/Carton.pm b/lib/Carton.pm
index b7abb9c..1f2157a 100644
--- a/lib/Carton.pm
+++ b/lib/Carton.pm
@@ -19,7 +19,7 @@ our $Colors = {
 sub new {
     my $class = shift;
     bless {
-        path  => 'extlib',
+        path  => 'local',
         color => 1,
         verbose => 0,
         cpanm => $ENV{PERL_CARTON_CPANM} || 'cpanm',
@@ -91,12 +91,11 @@ sub cmd_install {
 
     $self->parse_options(\@args, "p|path=s", \$self->{path}, "deployment!" => \$self->{deployment});
 
-#    if (@args) {
-#        $self->print("Installing modules from the command line\n");
-#        $self->install_modules(@args);
-#        $self->update_packages;
-#    }
-    if (my $file = $self->has_build_file) {
+    if (@args) {
+        $self->print("Installing modules from the command line\n");
+        $self->install_modules(@args);
+        $self->update_packages;
+    } elsif (my $file = $self->has_build_file) {
         $self->print("Installing modules using $file\n");
         $self->install_from_build_file($file);
         $self->update_packages;

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