Fix a traceback when failed to unlock a keyring

openSUSE · Apr 28, 2023 · 1a6fa63 · 1a6fa63
1 parent 0ea0015
commit 1a6fa63
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/osc/babysitter.py b/osc/babysitter.py
@@ -36,6 +36,14 @@ class RPMError(Exception):
         pass
 
 
+try:
+    from keyring.errors import KeyringLocked
+except ImportError:
+    # python-keyring is not installed
+    class KeyringLocked:
+        pass
+
+
 # the good things are stolen from Matt Mackall's mercurial
 
 
@@ -178,6 +186,8 @@ def run(prg, argv=None):
         print(f'{e.fname}:', e.msg, file=sys.stderr)
     except RPMError as e:
         print(e, file=sys.stderr)
+    except KeyringLocked as e:
+        print(e, file=sys.stderr)
     except CertVerificationError as e:
         print(e, file=sys.stderr)
     except urllib3.exceptions.MaxRetryError as e: