mirror of
https://git.yoctoproject.org/poky
synced 2026-06-06 14:49:50 +00:00
terminal.py: Restore error output from Terminal
In bitbake commit 1ecc1d94 (process: Do not mix stderr with stdout), bb.process.Popen() was changed to no longer combine stdout and stderr by default. However, the Terminal class was not updated to reflect this and subsequently only output stdout in case of failures. (From OE-Core rev: 116d0bb07ba044cf8847bf3d5c3996ad7e58b7ae) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
490bec3d50
commit
1e48a0e438
@@ -30,9 +30,10 @@ class Registry(oe.classutils.ClassRegistry):
|
||||
|
||||
class Terminal(Popen, metaclass=Registry):
|
||||
def __init__(self, sh_cmd, title=None, env=None, d=None):
|
||||
from subprocess import STDOUT
|
||||
fmt_sh_cmd = self.format_command(sh_cmd, title)
|
||||
try:
|
||||
Popen.__init__(self, fmt_sh_cmd, env=env)
|
||||
Popen.__init__(self, fmt_sh_cmd, env=env, stderr=STDOUT)
|
||||
except OSError as exc:
|
||||
import errno
|
||||
if exc.errno == errno.ENOENT:
|
||||
|
||||
Reference in New Issue
Block a user