mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 01:46:13 +01:00
Code

Merge pull request #1312 from dmach/fix-exception-when-failed-to-unlock-kwallet

Browse Source 
Fix a traceback when failed to unlock a keyring
This commit is contained in:
Daniel Mach 2023-04-28 21:54:59 +02:00 committed by GitHub
commit c6e09900ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/babysitter.py
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: