rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb/execute: Fix incremental decoder with --dry-run

Browse Source 
Closes #4726
This commit is contained in:
Chris Johns 2022-09-30 17:01:20 +10:00
parent cfed1659a2
commit e04c84191b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source-builder/sb/execute.py
View File

@ -182,7 +182,10 @@ class execute(object):
if trace_threads: if trace_threads:
print('execute:_readthread: start') print('execute:_readthread: start')
decoder = codecs.getincrementaldecoder(sys.stdout.encoding)() if sys.stdout.encoding is not None:
decoder = codecs.getincrementaldecoder(sys.stdout.encoding)()
else:
decoder = None
count = 0 count = 0
line = '' line = ''
try: try:
@ -202,7 +205,7 @@ class execute(object):
_output_line(line + '\n', exe, prefix, out, count) _output_line(line + '\n', exe, prefix, out, count)
break break
# str and bytes are the same type in Python2 # str and bytes are the same type in Python2
if type(data) is not str and type(data) is bytes: if decoder is not None and type(data) is not str and type(data) is bytes:
data = decoder.decode(data) data = decoder.decode(data)
last_ch = data[-1] last_ch = data[-1]
sd = (line + data).split('\n') sd = (line + data).split('\n')