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

Make read of email adress from oscrc more robust

Browse Source 
Fix possible KeyError when mismatch of apiurl with or without ending
slash.
This commit is contained in:
Michal Vyskocil 2009-11-18 15:03:49 +00:00
parent 921b78d93c
commit 4a0df19660
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/commandline.py
View File

@ -4288,8 +4288,13 @@ Please submit there instead, or use --nodevelproject to force direct submission.
user = conf.get_apiurl_usr(apiurl) user = conf.get_apiurl_usr(apiurl)
if conf.config['api_host_options'][apiurl].has_key('email'): # work with all combinations of URL with or withouth the ending slash
os.environ['mailaddr'] = conf.config['api_host_options'][apiurl]['email'] apiurl2 = apiurl[:-1] if apiurl[-1] == '/' else ("%s/" % apiurl)
host_opts = conf.config['api_host_options'].get(apiurl) or \
conf.config['api_host_options'].get(apiurl2)
if host_opts and host_opts.has_key('email'):
os.environ['mailaddr'] = host_opts['email']
else: else:
try: try:
os.environ['mailaddr'] = get_user_data(apiurl, user, 'email')[0] os.environ['mailaddr'] = get_user_data(apiurl, user, 'email')[0]