mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-20 17:26:15 +02:00
Code

Merge branch 'master' of https://github.com/thorstenb/osc

Browse Source
This commit is contained in:
Marcus Huewe 2013-11-28 11:52:02 +01:00
commit 2d7f644f44
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/conf.py
View File

@ -817,7 +817,7 @@ def get_config(override_conffile=None,
try:
# Read from keyring lib if available
user = cp.get(url, 'user', raw=True)
password = keyring.get_password(host, user)
password = str(keyring.get_password(host, user))
except:
# Fallback to file based auth.
pass
@ -829,7 +829,7 @@ def get_config(override_conffile=None,
raise oscerr.ConfigError('no user found in keyring', conffile)
user = gk_data[0]['user']
if 'password' in gk_data[0]:
password = gk_data[0]['password']
password = str(gk_data[0]['password'])
else:
# this is most likely an error
print('warning: no password found in keyring', file=sys.stderr)