Skip to content

Commit 1850921

Browse files
authored
Merge branch 'master' into bst/fix-remote-forward
2 parents d3da6e2 + 36bc654 commit 1850921

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Bug fixes in 0.5.0
1010

1111
- Fixed a bug where using ``labgrid-client io get`` always returned ``low``
1212
when reading a ``sysfsgpio``.
13+
- Fix labgrid-client exit code on keyboard interrupt.
1314
- Fixed ``labgrid-client forward --remote``/``-R``, which used either the LOCAL
1415
part of ``--local``/``-L`` accidentally (if specified) or raised an
1516
UnboundLocalError.

labgrid/remote/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1904,7 +1904,7 @@ def main():
19041904
print(f"{parser.prog}: error: {e}", file=sys.stderr)
19051905
exitcode = 1
19061906
except KeyboardInterrupt:
1907-
exitcode = 0
1907+
exitcode = 1
19081908
except Exception: # pylint: disable=broad-except
19091909
traceback.print_exc()
19101910
exitcode = 2

0 commit comments

Comments
 (0)