sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-02-07 05:30:44 +00:00
Code Issues Releases Wiki Activity

android: Fix whitespace in wildcard match for ADB pull

Browse Source 
When there are multiple matches for the wildcard, the output has been
observed to have a space at the end. That means the pull command doesn't
work. This commit fixes that.
This commit is contained in:
Brendan Jackman 2016-11-18 17:48:48 +00:00
parent 290af6619d
commit ee38a4244a
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

@ -210,7 +210,7 @@ class AdbConnection(object):
command = 'shell {} {}'.format(self.ls_command, source) command = 'shell {} {}'.format(self.ls_command, source)
output = adb_command(self.device, command, timeout=timeout) output = adb_command(self.device, command, timeout=timeout)
for line in output.splitlines(): for line in output.splitlines():
command = "pull '{}' '{}'".format(line, dest) command = "pull '{}' '{}'".format(line.strip(), dest)
adb_command(self.device, command, timeout=timeout) adb_command(self.device, command, timeout=timeout)
return return
command = "pull '{}' '{}'".format(source, dest) command = "pull '{}' '{}'".format(source, dest)