[carton] 347/472: locate cpanm within App-cpanminus dist dir. Fix #92

Lucas Kanashiro kanashiro-guest at moszumanska.debian.org
Fri Jul 24 00:39:23 UTC 2015


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

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

commit 56555b6f34bd6d3f4770b6c6893f2202ef1fe38f
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Tue Jul 23 14:17:11 2013 -0700

    locate cpanm within App-cpanminus dist dir. Fix #92
---
 cpanfile              | 3 ++-
 lib/Carton/Builder.pm | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cpanfile b/cpanfile
index e06c004..a6b6aff 100644
--- a/cpanfile
+++ b/cpanfile
@@ -15,9 +15,10 @@ requires 'Exception::Class', 1.32;
 requires 'Getopt::Long', 2.39;
 requires 'Moo', 1.002;
 requires 'Path::Tiny', 0.022;
+requires 'File::ShareDir', 1.03;
 
 # MYMETA support
-requires 'App::cpanminus', 1.6927;
+requires 'App::cpanminus', 1.6928;
 requires 'ExtUtils::MakeMaker', 6.64;
 requires 'Module::Build', 0.4004;
 requires 'CPAN::Meta', 2.120921;
diff --git a/lib/Carton/Builder.pm b/lib/Carton/Builder.pm
index 634f9d2..9aaa85b 100644
--- a/lib/Carton/Builder.pm
+++ b/lib/Carton/Builder.pm
@@ -1,5 +1,6 @@
 package Carton::Builder;
 use strict;
+use File::ShareDir 'dist_file';
 use Moo;
 
 has mirror  => (is => 'rw');
@@ -87,7 +88,8 @@ sub update {
 sub run_cpanm {
     my($self, @args) = @_;
     local $ENV{PERL_CPANM_OPT};
-    !system "cpanm", "--quiet", "--notest", @args;
+    my $bin = dist_file('App-cpanminus', 'cpanm');
+    !system $^X, $bin, "--quiet", "--notest", @args;
 }
 
 1;

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



More information about the Pkg-perl-cvs-commits mailing list