Proper fix for #2236

This commit is contained in:
Miroslav Stampar
2016-10-18 20:17:51 +02:00
parent d431c7d155
commit 1db6953f08
4 changed files with 10 additions and 8 deletions

View File

@@ -2242,9 +2242,10 @@ def _mergeOptions(inputOptions, overrideOptions):
if key not in conf or value not in (None, False) or overrideOptions:
conf[key] = value
for key, value in conf.items():
if value is not None:
kb.explicitSettings.add(key)
if not hasattr(conf, "api"):
for key, value in conf.items():
if value is not None:
kb.explicitSettings.add(key)
for key, value in defaults.items():
if hasattr(conf, key) and conf[key] is None: