Skip to content

Commit 0f0a80d

Browse files
committed
Merge remote-tracking branch 'origin/pr/35'
* origin/pr/35: ci: drop R4.1, add R4.3 Fix parsing device capabilities Pull request description: It's ascii, not binary. Fortunately, for mouse reporting relative or absolute X,Y events only the result is the same. QubesOS/qubes-issues#9563
2 parents cd5e5f2 + 15acdb2 commit 0f0a80d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
include:
2-
- file: /r4.1/gitlab-base.yml
3-
project: QubesOS/qubes-continuous-integration
4-
- file: /r4.1/gitlab-dom0.yml
5-
project: QubesOS/qubes-continuous-integration
6-
- file: /r4.1/gitlab-vm.yml
7-
project: QubesOS/qubes-continuous-integration
82
- file: /r4.2/gitlab-base.yml
93
project: QubesOS/qubes-continuous-integration
104
- file: /r4.2/gitlab-host.yml
115
project: QubesOS/qubes-continuous-integration
126
- file: /r4.2/gitlab-vm.yml
137
project: QubesOS/qubes-continuous-integration
8+
- file: /r4.3/gitlab-base.yml
9+
project: QubesOS/qubes-continuous-integration
10+
- file: /r4.3/gitlab-host.yml
11+
project: QubesOS/qubes-continuous-integration
12+
- file: /r4.3/gitlab-vm.yml
13+
project: QubesOS/qubes-continuous-integration

qubes-rpc/qubes-input-trigger

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ def get_service_name(udevreturn, input_dev):
3939
try:
4040
devpath = [line.split("=", 1)[1] for line in udevreturn.splitlines()
4141
if line.startswith("DEVPATH=")][0]
42-
with open(f"/sys/{devpath}/device/capabilities/abs", "rb") as f:
43-
abs_bytes = f.read()
44-
# we care about only the first byte - that's where X,Y axies are
45-
abs_caps = abs_bytes[0]
46-
except (IndexError, FileNotFoundError):
42+
with open(f"/sys/{devpath}/device/capabilities/abs", "r") as f:
43+
abs_string = f.read().strip()
44+
# we care about only the last byte - that's where X,Y axies are
45+
abs_caps = int(abs_string.split()[-1], 16)
46+
except (IndexError, FileNotFoundError, ValueError):
4747
abs_caps = 0
4848
if (
4949
('ID_INPUT_TABLET' in udevreturn) or

0 commit comments

Comments
 (0)