From f1c8ca1a6670345aafa812a9e4b5cf18d28f117b Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Fri, 20 Aug 2021 16:22:20 +0100 Subject: [PATCH] utils.android: Separate stdout and stderr by newline Following what the other connections are doing, make the android connection separate stdout and stderr by a newline. --- devlib/utils/android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devlib/utils/android.py b/devlib/utils/android.py index fc502b9..018d3d2 100755 --- a/devlib/utils/android.py +++ b/devlib/utils/android.py @@ -576,7 +576,7 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, '-----\nSTDERR:\n-----\n{}\n-----' 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,