fix issue #6394: capture git stderr/stdout

Adds new dependency: perl(IPC::Run::Debug)
os-autoinst · Jul 29, 2015 · 9a9e785 · 9a9e785
1 parent c7accde
commit 9a9e785
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/DEPENDENCIES.txt b/DEPENDENCIES.txt
@@ -32,6 +32,7 @@ FindBin
 Getopt::Long
 IO::Socket::INET6
 IO::Socket::SSL
+IPC::Run::Debug
 JSON
 LWP::UserAgent
 List::MoreUtils

diff --git a/lib/OpenQA/WebAPI/Controller/Step.pm b/lib/OpenQA/WebAPI/Controller/Step.pm
@@ -23,6 +23,7 @@ use File::Which qw(which);
 use POSIX qw/strftime/;
 use Try::Tiny;
 use JSON;
+use IPC::Run();
 
 sub init {
     my $self = shift;
@@ -353,16 +354,30 @@ sub _commit_git {
     }
     my @git = ('git', '--git-dir', "$dir/.git", '--work-tree', $dir);
     my @files = ($dir . '/' . $name . '.json', $dir . '/' . $name . '.png');
-    if (system(@git, 'add', @files) != 0) {
+
+    my ($stdin, $stdout_err, $ret);
+
+    $ret = IPC::Run::run([@git, 'add', @files], \$stdin, '>&', \$stdout_err);
+    chomp $stdout_err;
+    $self->app->log->debug($stdout_err);
+    unless ($ret) {
         die "failed to git add $name";
     }
+
     my @cmd = (@git, 'commit', '-q', '-m', sprintf("%s for %s", $name, $job->name), sprintf('--author=%s <%s>', $self->current_user->fullname, $self->current_user->email), @files);
     $self->app->log->debug(join(' ', @cmd));
-    if (system(@cmd) != 0) {
+    $ret = IPC::Run::run([@cmd], \$stdin, '>&', \$stdout_err);
+    chomp $stdout_err;
+    $self->app->log->debug($stdout_err);
+    unless ($ret) {
         die "failed to git commit $name";
     }
+
     if (($self->app->config->{'scm git'}->{'do_push'} || '') eq 'yes') {
-        if (system(@git, 'push') != 0) {
+        $ret = IPC::Run::run([@git, 'push'], \$stdin, '>&', \$stdout_err);
+        chomp $stdout_err;
+        $self->app->log->debug($stdout_err);
+        unless ($ret) {
             die "failed to git push $name";
         }
     }