reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lister.cli: Clarify configuration loading step

Browse source
This commit is contained in:
Antoine R. Dumont (@ardumont) 2019-11-07 16:06:26 +01:00
parent e8a67a7650
commit eebbc859fc
No known key found for this signature in database
GPG key ID: 52E2E9840D10C3B8
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
swh/lister/cli.py
View file

@ -54,17 +54,15 @@ def lister(ctx, config_file, db_url):
from swh.core import config
ctx.ensure_object(dict)
override_conf = {}
if not config_file:
config_file = os.environ.get('SWH_CONFIG_FILENAME')
conf = config.read(config_file)
if db_url:
override_conf['lister'] = {
conf['lister'] = {
'cls': 'local',
'args': {'db': db_url}
}
if not config_file:
config_file = os.environ.get('SWH_CONFIG_FILENAME')
conf = config.read(config_file, override_conf)
ctx.obj['config'] = conf
ctx.obj['override_conf'] = override_conf
@lister.command(name='db-init', context_settings=CONTEXT_SETTINGS)