From 4b79227b5ad4ad1f640b379688077e00e70284df Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Mon, 13 Dec 2010 21:36:23 +0000
Subject: [PATCH] Minor bug fix to properly merge options from .conf file (-c)
 with command line switches

---
 lib/core/option.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/core/option.py b/lib/core/option.py
index f5e3341f5..dc7bddd64 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1298,7 +1298,8 @@ def __mergeOptions(inputOptions):
         inputOptionsItems = inputOptions.__dict__.items()
 
     for key, value in inputOptionsItems:
-        if not conf.has_key(key) or conf[key] is None or value is not None:
+        if key not in conf or (conf[key] is False and value is True) or \
+           value not in (None, False):
             conf[key] = value
 
 def __setTrafficOutputFP():