summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-13 12:58:16 +0000
committerGerrit Code Review <review@openstack.org>2016-10-13 12:58:16 +0000
commitd57e5380be1d829b15ce1ba14ce659c501fccac4 (patch)
treeb8eb4a6b5d5fdf2accaad82116f1f3628398c191
parent4a691931f378109fd9e1ec97bff0f26dde591e89 (diff)
parent8cb33529fb6e7a5a242215cdf0d5da2964e4d492 (diff)
downloadoslo-config-d57e5380be1d829b15ce1ba14ce659c501fccac4.tar.gz
Merge "Fix wrong usage of DuplicateOptError"3.18.0
-rw-r--r--oslo_config/cfg.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/oslo_config/cfg.py b/oslo_config/cfg.py
index d6ec3a6..1697b2f 100644
--- a/oslo_config/cfg.py
+++ b/oslo_config/cfg.py
@@ -2127,8 +2127,9 @@ class _CachedArgumentParser(argparse.ArgumentParser):
try:
container.add_argument(*argument['args'],
**argument['kwargs'])
- except argparse.ArgumentError as e:
- raise DuplicateOptError(e)
+ except argparse.ArgumentError:
+ options = ','.join(argument['args'])
+ raise DuplicateOptError(options)
self._args_cache = {}
def parse_args(self, args=None, namespace=None):