[PATCH 1/4] ExecCmd: include stdout data in ExecCmdFail if command failed

[Jan Tluka]

ExecCmdFail exception is thrown if a command returns with non-zero
returncode. When this happens only stderr is saved in the exception.
User might want to work with both the stdout and stderr.

This patch saves stdout data along with stderr in this case.

Signed-off-by: Jan Tluka 
---
 lnst/Common/ExecCmd.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lnst/Common/ExecCmd.py b/lnst/Common/ExecCmd.py
index d6c92c6..d432c2c 100644
--- a/lnst/Common/ExecCmd.py
+++ b/lnst/Common/ExecCmd.py
@@ -17,10 +17,12 @@ class ExecCmdFail(Exception):
     _cmd = None
     _retval = None
     _stderr = None
+    _stdout = None
     _report_stderr = None

-    def __init__(self, cmd=None, retval=None, err="", report_stderr=False):
-        self._stderr = err
+    def __init__(self, cmd=None, retval=None, outs=["", ""], report_stderr=False):
+        self._stdout = outs[0]
+        self._stderr = outs[1]
         self._retval = retval
         self._report_stderr = report_stderr

@@ -30,6 +32,9 @@ class ExecCmdFail(Exception):
     def get_stderr(self):
         return self._stderr

+    def get_stdout(self):
+        return self._stdout
+
     def __str__(self):
         retval = ""
         stderr = ""
@@ -63,7 +68,7 @@ def exec_cmd(cmd, die_on_err=True, log_outputs=True, report_stderr=False):
         if data_stderr:
             log_output(logging.debug, "Stderr", data_stderr)
     if subp.returncode and die_on_err:
-        err = ExecCmdFail(cmd, subp.returncode, data_stderr,report_stderr)
+        err = ExecCmdFail(cmd, subp.returncode, [data_stdout, data_stderr], report_stderr)
         logging.error(err)
         raise err