1
0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00

AndroidTarget: fixed use of variables in as_root=True commands.

In order to execute as root, the command string gets echo'd into so;
previusly, double quotes were used in echo, which caused any veriables
in the command string to be expanded _before_ it was echoed.
This commit is contained in:
Sergei Trofimov 2015-12-14 17:21:47 +00:00
parent f52bf79eb6
commit 171cc25d50

View File

@ -287,7 +287,7 @@ def _ping(device):
def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=False): # NOQA def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=False): # NOQA
_check_env() _check_env()
if as_root: if as_root:
command = 'echo "{}" | su'.format(escape_double_quotes(command)) command = 'echo \'{}\' | su'.format(escape_single_quotes(command))
device_string = ' -s {}'.format(device) if device else '' device_string = ' -s {}'.format(device) if device else ''
full_command = 'adb{} shell "{}"'.format(device_string, full_command = 'adb{} shell "{}"'.format(device_string,
escape_double_quotes(command)) escape_double_quotes(command))