sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

utils.android: Separate stdout and stderr by newline

Browse Source 
Following what the other connections are doing, make the android
connection separate stdout and stderr by a newline.
This commit is contained in:
Douglas Raillard 2021-08-20 16:22:20 +01:00 committed by Marc Bonnici
parent b719808ef2
commit f1c8ca1a66
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devlib/utils/android.py
View File

@ -576,7 +576,7 @@ def adb_shell(device, command, timeout=None, check_exit_code=False,
'-----\nSTDERR:\n-----\n{}\n-----' '-----\nSTDERR:\n-----\n{}\n-----'
raise TargetTransientError(message.format(raw_output, error)) raise TargetTransientError(message.format(raw_output, error))
return output + error return '\n'.join(x for x in (output, error) if x)
def adb_background_shell(conn, command, def adb_background_shell(conn, command,