diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-04 16:06:25 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 07:26:42 +0100 |
| commit | 5b556f58a171e3d45107bb56a1f780e5c1abba37 (patch) | |
| tree | 695ca377958158f54b3036fe5ded46de899fa948 /scripts/lib | |
| parent | 997ff239bd753a7957cc14c6829b2f093d9bcef6 (diff) | |
| download | openembedded-core-5b556f58a171e3d45107bb56a1f780e5c1abba37.tar.gz openembedded-core-5b556f58a171e3d45107bb56a1f780e5c1abba37.tar.bz2 openembedded-core-5b556f58a171e3d45107bb56a1f780e5c1abba37.zip | |
wic: decode output of subprocess.communicate
stdeout and stderr content returned by communicate API has different
types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8'
makes it unicode on both pythons.
Decoded stdout and stderr output to utf-8 to make the code
working under both Python 2 and Python 3.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/wic/utils/runner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/utils/runner.py b/scripts/lib/wic/utils/runner.py index 737751bd73..db536ba588 100644 --- a/scripts/lib/wic/utils/runner.py +++ b/scripts/lib/wic/utils/runner.py @@ -65,8 +65,8 @@ def runtool(cmdln_or_args, catch=1): process = subprocess.Popen(cmdln_or_args, stdout=sout, stderr=serr, shell=shell) (sout, serr) = process.communicate() - # combine stdout and stderr, filter None out - out = ''.join(filter(None, [sout, serr])) + # combine stdout and stderr, filter None out and decode + out = ''.join([out.decode('utf-8') for out in [sout, serr] if out]) except OSError as err: if err.errno == 2: # [Errno 2] No such file or directory |