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

Merge pull request #29 from ep1cman/fixes

Browse Source 
AdbConnection: added automatic detection of new line separators
This commit is contained in:
setrofim 2016-03-23 15:20:58 +00:00
commit 10978b0fd7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devlib/utils/android.py
View File

@ -26,8 +26,8 @@ import logging
import re import re
from collections import defaultdict from collections import defaultdict
from devlib.exception import TargetError, HostError from devlib.exception import TargetError, HostError, DevlibError
from devlib.utils.misc import check_output, which from devlib.utils.misc import check_output, which, memoized
from devlib.utils.misc import escape_single_quotes, escape_double_quotes from devlib.utils.misc import escape_single_quotes, escape_double_quotes
@ -157,6 +157,17 @@ class AdbConnection(object):
def name(self): def name(self):
return self.device return self.device
@property
@memoized
def newline_separator(self):
output = adb_command(self.device, "shell '(ls); echo \"\n$?\"'")
if output.endswith('\r\n'):
return '\r\n'
elif output.endswith('\n'):
return '\n'
else:
raise DevlibError("Unknown line ending")
def __init__(self, device=None, timeout=10): def __init__(self, device=None, timeout=10):
self.timeout = timeout self.timeout = timeout
if device is None: if device is None:
@ -308,9 +319,9 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=Fals
raw_output, error = check_output(actual_command, timeout, shell=True) raw_output, error = check_output(actual_command, timeout, shell=True)
if raw_output: if raw_output:
try: try:
output, exit_code, _ = raw_output.rsplit('\r\n', 2) output, exit_code, _ = raw_output.rsplit(self.newline_separator, 2)
except ValueError: except ValueError:
exit_code, _ = raw_output.rsplit('\r\n', 1) exit_code, _ = raw_output.rsplit(self.newline_separator, 1)
output = '' output = ''
else: # raw_output is empty else: # raw_output is empty
exit_code = '969696' # just because exit_code = '969696' # just because