mirror of
https://github.com/openSUSE/osc.git
synced 2025-09-05 20:58:42 +02:00
Fix a traceback when failed to unlock a keyring
This commit is contained in:
@@ -36,6 +36,14 @@ except:
|
||||
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:
|
||||
|
Reference in New Issue
Block a user