sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2024-10-06 02:40:50 +01:00
Code Issues Releases Wiki Activity

utils/check_output: Only attempt to decode output if present.

Browse Source 
If an error occurs while executing a command the `output` and `error`
variables may not get initialised, only attempted to decode their
contents if this is not the case.
This commit is contained in:
Marc Bonnici 2020-03-30 11:06:43 +01:00 committed by setrofim
parent 7780cfdd5c
commit b9d50ec164
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devlib/utils/misc.py
View File

@ -185,15 +185,15 @@ def check_output(command, timeout=None, ignore=None, inputtext=None, **kwargs):
timeout_expired = None
# Currently errors=replace is needed as 0x8c throws an error
output = output.decode(sys.stdout.encoding or 'utf-8', "replace")
error = error.decode(sys.stderr.encoding or 'utf-8', "replace")
output = output.decode(sys.stdout.encoding or 'utf-8', "replace") if output else ''
error = error.decode(sys.stderr.encoding or 'utf-8', "replace") if output else ''
if timeout_expired:
raise TimeoutError(command, output='\n'.join([output or '', error or '']))
raise TimeoutError(command, output='\n'.join([output, error]))
retcode = process.poll()
if retcode and ignore != 'all' and retcode not in ignore:
raise subprocess.CalledProcessError(retcode, command, output='\n'.join([output or '', error or '']))
raise subprocess.CalledProcessError(retcode, command, output='\n'.join([output, error]))
return output, error