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

Merge pull request #120 from bjackman/speed-up-ssh-execute

Browse Source 
ssh: Combine exit code and main command
This commit is contained in:
setrofim 2017-05-04 16:59:22 +01:00 committed by GitHub
commit 783669371d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devlib/utils/ssh.py
View File

@ -183,18 +183,26 @@ class SshConnection(object):
def execute(self, command, timeout=None, check_exit_code=True, def execute(self, command, timeout=None, check_exit_code=True,
as_root=False, strip_colors=True): #pylint: disable=unused-argument as_root=False, strip_colors=True): #pylint: disable=unused-argument
if command == '':
# Empty command is valid but the __devlib_ec stuff below will
# produce a syntax error with bash. Treat as a special case.
return ''
try: try:
with self.lock: with self.lock:
output = self._execute_and_wait_for_prompt(command, timeout, as_root, strip_colors) _command = '({}); __devlib_ec=$?; echo; echo $__devlib_ec'.format(command)
raw_output = self._execute_and_wait_for_prompt(
_command, timeout, as_root, strip_colors)
output, exit_code_text, _ = raw_output.rsplit('\r\n', 2)
if check_exit_code: if check_exit_code:
exit_code_text = self._execute_and_wait_for_prompt('echo $?', strip_colors=strip_colors, log=False)
try: try:
exit_code = int(exit_code_text.split()[0]) exit_code = int(exit_code_text)
if exit_code: if exit_code:
message = 'Got exit code {}\nfrom: {}\nOUTPUT: {}' message = 'Got exit code {}\nfrom: {}\nOUTPUT: {}'
raise TargetError(message.format(exit_code, command, output)) raise TargetError(message.format(exit_code, command, output))
except (ValueError, IndexError): except (ValueError, IndexError):
logger.warning('Could not get exit code for "{}",\ngot: "{}"'.format(command, exit_code_text)) logger.warning(
'Could not get exit code for "{}",\ngot: "{}"'\
.format(command, exit_code_text))
return output return output
except EOF: except EOF:
raise TargetError('Connection lost.') raise TargetError('Connection lost.')