mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-05 20:58:42 +02:00
Code Activity

Do not pass on unicode password from keyrings.

Browse Source 
Seems at least gnome keyring returns a unicode string here
needlessly, which calling code then trips over.
This commit is contained in:
Thorsten Behrens
2013-11-21 23:46:45 +01:00
parent 99b3af9a41
commit 9561a99d6b
1 changed files with 2 additions and 2 deletions
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)