Improve error debugging for invalid matches

This needs to be printed to stdout, otherwise meson won't show it.
linuxwacom · Mar 26, 2024 · 9f54fcf · 9f54fcf
1 parent e3a1e70
commit 9f54fcf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/test/test_udev_rules.py b/test/test_udev_rules.py
@@ -57,8 +57,13 @@ def pytest_generate_tests(metafunc):
                 if bus not in ['usb', 'bluetooth']:
                     continue
 
-                vid = int(vid, 16)
-                pid = int(pid, 16)
+                try:
+                    vid = int(vid, 16)
+                    pid = int(pid, 16)
+                except ValueError as e:
+                    print(f"Invalid vid/pid in {match} in {f}", file=sys.stderr)
+                    raise e
+
                 if bus == 'usb':
                     bus = 0x3
                 elif bus == 'bluetooth':

diff --git a/tools/libwacom-update-db.py b/tools/libwacom-update-db.py
@@ -132,7 +132,7 @@ def _load(self, path):
                 try:
                     bus, vid, pid, *_ = match.split(":")
                 except ValueError as e:
-                    print(f"Failed to process match {match}")
+                    print(f"Failed to process match {match} in {file}", file=sys.stderr)
                     raise e
 
                 name = config["Device"]["Name"]