summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/rootfs.py
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-03-03 18:36:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:45:21 +0000
commita820b3f78ebcded07a81da3905c1bcdd4f173a23 (patch)
tree89865616fd0aa3a7728fcd0f24dde697272fd2d1 /meta/lib/oe/rootfs.py
parent7b70586a31e3df0ba35a7766b3b9d48e0d5d75b9 (diff)
downloadpoky-a820b3f78ebcded07a81da3905c1bcdd4f173a23.tar.gz
image.py, rootfs.py, package_manager.py: redirect stderr to stdout when calling check_output()
If a command executed with subprocess.check_output() fails, the subprocess.CalledProcessError.output contains only STDOUT and the user needs to check the log.do_rootfs to see any other details. This commit forwards stderr to stdout so that, in case of failure, the entire error output will be displayed in terminal. [YOCTO #5902] (From OE-Core rev: 4661f1441429952f30e19cebd93dc42ce31fd868) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r--meta/lib/oe/rootfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index be0afa6d74..90c0504b31 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -57,7 +57,7 @@ class Rootfs(object):
57 exec_cmd = cmd 57 exec_cmd = cmd
58 58
59 try: 59 try:
60 subprocess.check_output(exec_cmd) 60 subprocess.check_output(exec_cmd, stderr=subprocess.STDOUT)
61 except subprocess.CalledProcessError as e: 61 except subprocess.CalledProcessError as e:
62 return("Command '%s' returned %d:\n%s" % (e.cmd, e.returncode, e.output)) 62 return("Command '%s' returned %d:\n%s" % (e.cmd, e.returncode, e.output))
63 63