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 #95 from bjackman/android-setup-error

Browse Source 
android: Improve error when _setup_ls fails
This commit is contained in:
setrofim 2017-03-02 12:03:57 +00:00 committed by GitHub
commit 96ff1aa205
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devlib/utils/android.py
View File

@ -177,7 +177,12 @@ class AdbConnection(object):
# versions of the ls tool in Android pre-v7. # versions of the ls tool in Android pre-v7.
def _setup_ls(self): def _setup_ls(self):
command = "shell '(ls -1); echo \"\n$?\"'" command = "shell '(ls -1); echo \"\n$?\"'"
output = adb_command(self.device, command, timeout=self.timeout) try:
output = adb_command(self.device, command, timeout=self.timeout)
except subprocess.CalledProcessError as e:
raise HostError(
'Failed to set up ls command on Android device. Output:\n'
+ e.output)
lines = output.splitlines() lines = output.splitlines()
retval = lines[-1].strip() retval = lines[-1].strip()
if int(retval) == 0: if int(retval) == 0: