Skip to content

Commit b69ff84

Browse files
committed
driver: SigrokDriver capture file is transferred to wrong path
when specified filename is not absolute and using a remote sigrok resource Usually when an absolute path is supplied as `filename` the call `abs.path.join()` resolves to `filename`. But when the file path is relative, it resolves it to a relative path appended to the tmp dir, instead of from where the user calls this method. Signed-off-by: Felix Zwettler <felix.zwettler@duagon.com>
1 parent 581296e commit b69ff84

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

labgrid/driver/sigrokdriver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def stop(self):
179179
if isinstance(self.sigrok, NetworkSigrokUSBDevice):
180180
subprocess.call([
181181
'scp', f'{self.sigrok.host}:{os.path.join(self._tmpdir, self._basename)}',
182-
os.path.join(self._local_tmpdir, self._filename)
182+
os.path.abspath(self._filename)
183183
],
184184
stdin=subprocess.DEVNULL,
185185
stdout=subprocess.DEVNULL,

0 commit comments

Comments
 (0)