summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorGiampaolo Lauria <lauria@us.ibm.com>2012-07-20 16:41:45 -0400
committerGiampaolo Lauria <lauria@us.ibm.com>2012-07-24 11:12:05 -0400
commit90da88cce51bccd320e89141ed7384d2e7ccca9d (patch)
tree9b7636cc854e3705c88e9d2fb2a16c5e2326ada4 /openstack
parent1e2298fadb38280b46c811e1feb43f4e9244de77 (diff)
downloadoslo-90da88cce51bccd320e89141ed7384d2e7ccca9d.tar.gz
oslo-90da88cce51bccd320e89141ed7384d2e7ccca9d.tar.xz
oslo-90da88cce51bccd320e89141ed7384d2e7ccca9d.zip
Modifies _is_opt_registered fcn to check for duplicate opts
This change fixes bug 999307 Currently, the check for duplicate options is done by checking whether they are the same object. The proposed fix is to check whether all the object fields have the same value. Change-Id: I2b72d630a0c8821df1d81e25d316d8d9195be492
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/cfg.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py
index 109bc28..728ecdc 100644
--- a/openstack/common/cfg.py
+++ b/openstack/common/cfg.py
@@ -464,7 +464,7 @@ def _is_opt_registered(opts, opt):
:raises: DuplicateOptError if a naming conflict is detected
"""
if opt.dest in opts:
- if opts[opt.dest]['opt'] is not opt:
+ if opts[opt.dest]['opt'] != opt:
raise DuplicateOptError(opt.name)
return True
else:
@@ -527,6 +527,9 @@ class Opt(object):
else:
self.deprecated_name = None
+ def __ne__(self, another):
+ return vars(self) != vars(another)
+
def _get_from_config_parser(self, cparser, section):
"""Retrieves the option value from a MultiConfigParser object.