#3690 uinput packages can be broken in new ways

Xpra-org · Jan 8, 2023 · d9f8b7e · d9f8b7e
1 parent 56d530e
commit d9f8b7e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
@@ -471,18 +471,18 @@ def has_uinput():
     try:
         import uinput
         assert uinput
-    except NameError as e:
-        log = get_util_logger()
-        log("has_uinput()", exc_info=True)
-        log.warn("Warning: the system python uinput module looks broken:")
-        log.warn(" %s", e)
-        return False
     except ImportError as e:
         log = get_util_logger()
         log("has_uinput()", exc_info=True)
         log.info("cannot access python uinput module:")
         log.info(" %s", e)
         return False
+    except Exception as e:
+        log = get_util_logger()
+        log("has_uinput()", exc_info=True)
+        log.warn("Warning: the system python uinput module looks broken:")
+        log.warn(" %s", e)
+        return False
     try:
         uinput.fdopen()         #@UndefinedVariable
     except Exception as e: