#3690 uinput packages can be broken in new ways

Xpra-org · Nov 21, 2022 · 2c192de · 2c192de
1 parent f599a85
commit 2c192de
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
@@ -406,16 +406,16 @@ def has_uinput():
     try:
         import uinput
         assert uinput
-    except NameError as e:
+    except ImportError:
         log = get_util_logger()
         log("has_uinput()", exc_info=True)
-        log.warn("Warning: the system python uinput module looks broken:")
-        log.warn(" %s", e)
+        log.info("no uinput module (not usually needed)")
         return False
-    except ImportError:
+    except Exception as e:
         log = get_util_logger()
         log("has_uinput()", exc_info=True)
-        log.info("no uinput module (not usually needed)")
+        log.warn("Warning: the system python uinput module looks broken:")
+        log.warn(" %s", e)
         return False
     try:
         uinput.fdopen()         #@UndefinedVariable