Merge pull request #338 from Yubico/fix/permission

Smaller fixes
Yubico · Feb 3, 2023 · 2a81df9 · 2a81df9
2 parents 864fbee + 5682fdd
commit 2a81df9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ykman-cli/py/cli.py b/ykman-cli/py/cli.py
@@ -2,7 +2,10 @@
 # -*- coding: utf-8 -*-
 
 import sys
-from ykman.cli.__main__ import main
+try:
+    from ykman._cli.__main__ import main
+except (ModuleNotFoundError, ImportError):
+    from ykman.cli.__main__ import main
 
 
 def run(argv):

diff --git a/ykman-gui/py/yubikey.py b/ykman-gui/py/yubikey.py
@@ -84,6 +84,10 @@ def wrapped(*args, **kwargs):
             logger.error('Failed to open device', exc_info=e)
             return failure('open_device_failed')
 
+        except TypeError as e:
+            logger.error('Failed to open device', exc_info=e)
+            return failure('open_device_failed')
+
         except Exception as e:
             if str(e) == 'Incorrect padding':
                 return failure('incorrect_padding')