From: Gui Chen <gui.chen@intel.com>
Date: Fri, 16 Mar 2012 06:18:06 +0000 (+0800)
Subject: correct stderr output lost in runner.runtool
X-Git-Tag: 0.8~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8d07c95d6051dcbe5d8cc4d930b66b6efac1324;p=platform%2Fupstream%2Fmic.git

correct stderr output lost in runner.runtool

Signed-off-by: Gui Chen <gui.chen@intel.com>
---

diff --git a/mic/utils/runner.py b/mic/utils/runner.py
index 12fa930..9e0522a 100644
--- a/mic/utils/runner.py
+++ b/mic/utils/runner.py
@@ -63,9 +63,9 @@ def runtool(cmdln_or_args, catch=1):
 
     try:
         p = Popen(cmdln_or_args, stdout=sout, stderr=serr, shell=shell)
-        out = p.communicate()[0]
-        if out is None:
-            out = ''
+        (sout, serr) = p.communicate()
+        # combine stdout and stderr, filter None out
+        out = ''.join(filter(None, [sout, serr]))
     except OSError, e:
         if e.errno == 2:
             # [Errno 2] No such file or directory