Skip to content

Commit 5409ca5

Browse files
JoshuaWattBastian-Krause
authored andcommitted
shelldriver: Fix xmodem
xmodem was failing because it would consume the trailing newline character between the `echo` for the marker and the command output. Fix this by suppressing new line on the marker Signed-off-by: Joshua Watt <[email protected]> Signed-off-by: Bastian Krause <[email protected]>
1 parent 5f0fe28 commit 5409ca5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

labgrid/driver/shelldriver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ def _start_xmodem_transfer(self, cmd):
314314
"""
315315

316316
marker = gen_marker()
317-
marked_cmd = f"echo '{marker[:4]}''{marker[4:]}'; {cmd}"
317+
marked_cmd = f"echo -n '{marker[:4]}''{marker[4:]}'; {cmd}"
318318
self.console.sendline(marked_cmd)
319319
self.console.expect(marker, timeout=30)
320320

0 commit comments

Comments
 (0)