From 63d98d8ce6445967cf009c58a5d31ea2e8c46b06 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 16 Jun 2011 08:08:49 +0000 Subject: [PATCH] fix for a bug reported by rdsears@mtu.edu (ignored config file items) --- lib/core/option.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index 5fd6764a6..c5f5fa990 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -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():