Prevent option override
Do not override box/suite specific configuration with global configuration. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
43193ad292
commit
d37bd67b2e
@ -77,7 +77,8 @@ def _config():
|
|||||||
if onemulti in config.sections():
|
if onemulti in config.sections():
|
||||||
for option in config.options(onemulti):
|
for option in config.options(onemulti):
|
||||||
for collection in configmap[multi]:
|
for collection in configmap[multi]:
|
||||||
configmap[multi][collection][option] = config.get(onemulti, option)
|
if not option in configmap[multi][collection]:
|
||||||
|
configmap[multi][collection][option] = config.get(onemulti, option)
|
||||||
if multi in ['boxes', 'suites']:
|
if multi in ['boxes', 'suites']:
|
||||||
if not len(lowconf):
|
if not len(lowconf):
|
||||||
_abort('No {} configured'.format(multi))
|
_abort('No {} configured'.format(multi))
|
||||||
|
Loading…
Reference in New Issue
Block a user