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

fix backward compatibility for .oscrc file after Marcus changes

Browse Source
This commit is contained in:
Adrian Schröter 2009-02-25 08:02:22 +00:00
parent 471f81b7f2
commit accc64ad41
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/conf.py
View File

@ -314,8 +314,10 @@ def get_config(override_conffile = None,
# backward compatibility # backward compatibility
if config.has_key('apisrv'): if config.has_key('apisrv'):
apisrv = config['apisrv'].lstrip('http://')
apisrv = apisrv.lstrip('https://')
scheme = config.get('scheme', 'https') scheme = config.get('scheme', 'https')
config['apiurl'] = urljoin(scheme, config['apisrv']) config['apiurl'] = urljoin(scheme, apisrv)
if config.has_key('apisrv') or config.has_key('scheme'): if config.has_key('apisrv') or config.has_key('scheme'):
import warnings import warnings
warnings.warn("Use of the 'scheme' or 'apisrv' config option is deprecated!", warnings.warn("Use of the 'scheme' or 'apisrv' config option is deprecated!",