From a6ddb0a85c33f46a669cc683ce0b52bdb1507a6c Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 24 Jul 2013 11:16:42 +0200 Subject: config.generator: remove the total number of options This is not really useful, and has the unbearable side effect of triggering merge errors when two patches modifying the number total of options go in at the same time. The merge could very likely succeed is there was not this particular line, so let's drop it! Change-Id: Iff7a0b71e88ab573ea668538ad6eba989e9a77b4 --- openstack/common/config/generator.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'openstack/common') diff --git a/openstack/common/config/generator.py b/openstack/common/config/generator.py index 3d2809b..07aa296 100644 --- a/openstack/common/config/generator.py +++ b/openstack/common/config/generator.py @@ -50,7 +50,6 @@ OPT_TYPES = { MULTISTROPT: 'multi valued', } -OPTION_COUNT = 0 OPTION_REGEX = re.compile(r"(%s)" % "|".join([STROPT, BOOLOPT, INTOPT, FLOATOPT, LISTOPT, MULTISTROPT])) @@ -97,8 +96,6 @@ def generate(srcfiles): for group, opts in opts_by_group.items(): print_group_opts(group, opts) - print("# Total option count: %d" % OPTION_COUNT) - def _import_module(mod_str): try: @@ -163,9 +160,7 @@ def _list_opts(obj): def print_group_opts(group, opts_by_module): print("[%s]" % group) print('') - global OPTION_COUNT for mod, opts in opts_by_module: - OPTION_COUNT += len(opts) print('#') print('# Options defined in %s' % mod) print('#') -- cgit