This is an automated email from the git hooks/post-receive script.
kanashiro-guest pushed a commit to branch master
in repository carton.
commit 1e8ac6ece725ebf4b6a311d0b40e4db98671495d
Author: Tatsuhiko Miyagawa <miyag...@bulknews.net>
Date: Wed Oct 19 15:29:24 2011 +0900
use capture instead of merged
---
xt/CLI.pm | 9 +++++++--
xt/cli/exec.t | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/xt/CLI.pm b/xt/CLI.pm
index 12bbbf3..0c6ad39 100644
--- a/xt/CLI.pm
+++ b/xt/CLI.pm
@@ -24,7 +24,7 @@ sub run {
package Carton::CLI::Tested;
use parent qw(Carton::CLI);
-use Capture::Tiny qw(capture_merged);
+use Capture::Tiny qw(capture);
sub new {
my($class, %args) = @_;
@@ -48,7 +48,7 @@ sub print {
sub run {
my($self, @args) = @_;
$self->{output} = '';
- $self->{system_output} = capture_merged {
+ ($self->{system_output}, $self->{system_error}) = capture {
eval { $self->SUPER::run(@args) };
};
}
@@ -63,5 +63,10 @@ sub system_output {
$self->{system_output};
}
+sub system_error {
+ my $self = shift;
+ $self->{system_error};
+}
+
1;
diff --git a/xt/cli/exec.t b/xt/cli/exec.t
index 223d1dd..dcdbaf3 100644
--- a/xt/cli/exec.t
+++ b/xt/cli/exec.t
@@ -6,7 +6,7 @@ use xt::CLI;
my $app = cli();
$app->run("exec", "--system", "--", "perl", "-e", "use Try::Tiny");
- like $app->system_output, qr/Can't locate Try\/Tiny.pm/;
+ like $app->system_error, qr/Can't locate Try\/Tiny.pm/;
$app->run("install", "Try::Tiny");
$app->run("exec", "--system", "--", "perl", "-e", 'use Try::Tiny; print
"OK\n"');
--
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
