fix for a bug reported by [email protected] (ignored config file items)

This commit is contained in:
Miroslav Stampar
2011-06-16 08:08:49 +00:00
parent ca8a60dd7a
commit 63d98d8ce6
+1 -2
View File
@@ -1608,8 +1608,7 @@ def __mergeOptions(inputOptions, overrideOptions):
inputOptionsItems = inputOptions.__dict__.items()
for key, value in inputOptionsItems:
if key not in conf or (conf[key] is False and value is True) or \
value not in (None, False) or overrideOptions:
if key not in conf or (not conf[key] and value) or overrideOptions:
conf[key] = value
def __setTrafficOutputFP():