github/OpenHands
1
0
Fork 0
mirror of https://github.com/OpenHands/OpenHands.git synced 2025-12-26 05:48:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix ssh_box error parsing

Browse Source
This commit is contained in:
Xingyao Wang 2024-05-16 23:14:49 +08:00
parent 7313421ae4
commit cd18ab215f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opendevin/runtime/docker/ssh_box.py
View File

@ -378,7 +378,7 @@ class DockerSSHBox(Sandbox):
logger.debug(
f'WAITING FOR END OF command output ({bool(output)}): {output}'
)
if output == '':
if output.strip() == '':
break
command_output += output
command_output = command_output.removesuffix('\r\n')
@ -386,17 +386,19 @@ class DockerSSHBox(Sandbox):
# get the exit code
self.ssh.sendline('echo $?')
self.ssh.prompt()
exit_code_str = self.ssh.before
exit_code_str = self.ssh.before.strip()
_start_time = time.time()
while not exit_code_str:
self.ssh.prompt()
exit_code_str = self.ssh.before
self.ssh.prompt(timeout=1)
exit_code_str = self.ssh.before.strip()
logger.debug(f'WAITING FOR exit code: {exit_code_str}')
if time.time() - _start_time > timeout:
return self._send_interrupt(
cmd, command_output, ignore_last_output=True
)
exit_code = int(exit_code_str.strip())
exit_code = int(
exit_code_str.replace('echo $?', '').replace('\r\n', '').strip()
)
return exit_code, command_output
def copy_to(self, host_src: str, sandbox_dest: str, recursive: bool = False):