1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-12 02:04:04 +02: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:
2023-04-28 21:54:59 +02:00
committed by GitHub

View File

@@ -36,6 +36,14 @@ except:
pass 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 # 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) print(f'{e.fname}:', e.msg, file=sys.stderr)
except RPMError as e: except RPMError as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
except KeyringLocked as e:
print(e, file=sys.stderr)
except CertVerificationError as e: except CertVerificationError as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
except urllib3.exceptions.MaxRetryError as e: except urllib3.exceptions.MaxRetryError as e: