mirror of
https://github.com/openSUSE/osc.git
synced 2024-12-25 17:36:13 +01:00
Merge pull request #1312 from dmach/fix-exception-when-failed-to-unlock-kwallet
Fix a traceback when failed to unlock a keyring
This commit is contained in:
commit
c6e09900ab
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user