sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-10-22 10:33:19 +01:00
Code Issues Releases Wiki Activity

adb_shell: fixing handling of line breaks at the end of the output

Browse Source 
- adb protcol uses "\r\n" for line breaks. This is not handled by
  Python's line break translation, as not a file. So spliting on '\n'
  when extracting the exit code resulted in stray '\r' in the output.
- adb_shell expects exit code to be echoed on the same line. This may
  not have been the case if latest output from executed command was not
  a complete line. An extra echo will now ensure that the exit code will
  be on its own line even in that case.
This commit is contained in:
Sergei Trofimov
2015-11-24 12:50:02 +00:00
parent 42d41e9345
commit 64261a65cb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devlib/utils/android.py
View File

@@ -293,14 +293,14 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=Fals
escape_double_quotes(command))
logger.debug(full_command)
if check_exit_code:
actual_command = "adb{} shell '({}); echo $?'".format(device_string,
escape_single_quotes(command))
actual_command = "adb{} shell '({}); echo; echo $?'".format(device_string,
escape_single_quotes(command))
raw_output, error = check_output(actual_command, timeout, shell=True)
if raw_output:
try:
output, exit_code, _ = raw_output.rsplit('\n', 2)
output, exit_code, _ = raw_output.rsplit('\r\n', 2)
except ValueError:
exit_code, _ = raw_output.rsplit('\n', 1)
exit_code, _ = raw_output.rsplit('\r\n', 1)
output = ''
else: # raw_output is empty
exit_code = '969696' # just because