[tor-commits] [rbm/master] Include stdout in remote_exec/remote_start error output

[boklm at torproject.org]

commit f494d16a1b86700661a029f5eca00c6216bf08d1
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Aug 8 21:00:10 2017 +0200

    Include stdout in remote_exec/remote_start error output
    
    Sometimes stdout can include useful informations about the error so
    include it in addition to stderr.
---
 lib/RBM.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm
index 100bc04..c1240cd 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -976,7 +976,7 @@ sub build_run {
             my ($stdout, $stderr, $success, $exit_code)
                 = run_script($project, $cmd, \&capture_exec);
             if (!$success) {
-                $error = "Error starting remote:\n$stderr";
+                $error = "Error starting remote:\n$stdout\n$stderr";
                 goto EXIT;
             }
         }
@@ -991,7 +991,7 @@ sub build_run {
             my ($stdout, $stderr, $success, $exit_code)
                 = run_script($project, $cmd, \&capture_exec);
             if (!$success) {
-                $error = "Error connecting to remote:\n$stderr";
+                $error = "Error connecting to remote:\n$stdout\n$stderr";
                 goto EXIT;
             }
             $remote_tmp = (split(/\r?\n/, $stdout))[0];