From 31839ef531e66e7d2db678b8968aa1cbbad91845 Mon Sep 17 00:00:00 2001
From: Yves Noirjean <yves.noirjean@id.ethz.ch>
Date: Fri, 26 Jan 2018 14:16:52 +0100
Subject: [PATCH] obis: using stderr as output in CommandResult in case of
error
---
src/python/OBis/obis/dm/command_result.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/python/OBis/obis/dm/command_result.py b/src/python/OBis/obis/dm/command_result.py
index 18e80abfdff..c53a1c00d68 100644
--- a/src/python/OBis/obis/dm/command_result.py
+++ b/src/python/OBis/obis/dm/command_result.py
@@ -5,7 +5,10 @@ class CommandResult(object):
"""Convert a completed_process object into a ShellResult."""
if completed_process:
self.returncode = completed_process.returncode
- self.output = completed_process.stdout.decode('utf-8').strip()
+ if completed_process.stderr:
+ self.output = completed_process.stderr.decode('utf-8').strip()
+ else:
+ self.output = completed_process.stdout.decode('utf-8').strip()
else:
self.returncode = returncode
self.output = output
--
GitLab