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

- support "apiurl = <some alias>" in the configfile

Browse Source
This commit is contained in:
Marcus Hüwe
2009-10-16 15:03:12 +00:00
parent 9a674cbda7
commit f8d3824ea5
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osc/conf.py
View File

@@ -514,19 +514,6 @@ def get_config(override_conffile = None,
raise oscerr.ConfigError(msg, conffile)
config = dict(cp.items('general', raw=1))
config['apiurl'] = urljoin(*parse_apisrv_url(None, config['apiurl']))
# backward compatibility
if config.has_key('apisrv'):
apisrv = config['apisrv'].lstrip('http://')
apisrv = apisrv.lstrip('https://')
scheme = config.get('scheme', 'https')
config['apiurl'] = urljoin(scheme, apisrv)
if config.has_key('apisrv') or config.has_key('scheme'):
print >>sys.stderr, 'Warning: Use of the \'scheme\' or \'apisrv\' in ~/.oscrc is deprecated!\n' \
'Warning: See README for migration details.'
if config.has_key('build_platform') and not config.has_key('build_repository'):
config['build_repository'] = config['build_platform']
for i in boolean_opts:
try:
@@ -636,6 +623,20 @@ def get_config(override_conffile = None,
# add the auth data we collected to the config dict
config['api_host_options'] = api_host_options
apiurl = aliases.get(config['apiurl'], config['apiurl'])
config['apiurl'] = urljoin(*parse_apisrv_url(None, apiurl))
# backward compatibility
if config.has_key('apisrv'):
apisrv = config['apisrv'].lstrip('http://')
apisrv = apisrv.lstrip('https://')
scheme = config.get('scheme', 'https')
config['apiurl'] = urljoin(scheme, apisrv)
if config.has_key('apisrv') or config.has_key('scheme'):
print >>sys.stderr, 'Warning: Use of the \'scheme\' or \'apisrv\' in ~/.oscrc is deprecated!\n' \
'Warning: See README for migration details.'
if config.has_key('build_platform') and not config.has_key('build_repository'):
config['build_repository'] = config['build_platform']
# override values which we were called with
if override_verbose:
config['verbose'] = override_verbose + 1