diff options
| -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): | |||
| 65 | process = subprocess.Popen(cmdln_or_args, stdout=sout, | 65 | process = subprocess.Popen(cmdln_or_args, stdout=sout, |
| 66 | stderr=serr, shell=shell) | 66 | stderr=serr, shell=shell) |
| 67 | (sout, serr) = process.communicate() | 67 | (sout, serr) = process.communicate() |
| 68 | # combine stdout and stderr, filter None out | 68 | # combine stdout and stderr, filter None out and decode |
| 69 | out = ''.join(filter(None, [sout, serr])) | 69 | out = ''.join([out.decode('utf-8') for out in [sout, serr] if out]) |
| 70 | except OSError as err: | 70 | except OSError as err: |
| 71 | if err.errno == 2: | 71 | if err.errno == 2: |
| 72 | # [Errno 2] No such file or directory | 72 | # [Errno 2] No such file or directory |