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

Fix loading password from keyring

Browse Source
This commit is contained in:
Daniel Mach 2023-10-03 08:56:15 +02:00
parent 91a30963d5
commit ce72ffb225
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/conf.py
View File

@ -1824,17 +1824,17 @@ def get_config(override_conffile=None,
for name, field in host_options.__fields__.items(): for name, field in host_options.__fields__.items():
ini_key = field.extra.get("ini_key", name) ini_key = field.extra.get("ini_key", name)
if ini_key in cp[url]:
value = cp[url][ini_key]
else:
continue
if name == "password": if name == "password":
# we need to handle the password first because it may be stored in a keyring instead of a config file
creds_mgr = _get_credentials_manager(url, cp) creds_mgr = _get_credentials_manager(url, cp)
value = creds_mgr.get_password(url, host_options.username, defer=True, apiurl=host_options.apiurl) value = creds_mgr.get_password(url, host_options.username, defer=True, apiurl=host_options.apiurl)
if value is None: if value is None:
raise oscerr.ConfigMissingCredentialsError("No password found in section {url}", conffile, url) raise oscerr.ConfigMissingCredentialsError("No password found in section {url}", conffile, url)
value = Password(value) value = Password(value)
elif ini_key in cp[url]:
value = cp[url][ini_key]
else:
continue
host_options.set_value_from_string(name, value) host_options.set_value_from_string(name, value)