diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-06-09 11:33:13 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-06-10 07:29:58 +0000 |
| commit | 1bf383e0cf424bee9dfd820b085bc148b708e834 (patch) | |
| tree | 9b98292d9a720c410a60bf8261f4f46780d844a1 /ipapython | |
| parent | f530886193c5c109b9514e5f1ddd52e8b11825e1 (diff) | |
| download | freeipa-1bf383e0cf424bee9dfd820b085bc148b708e834.tar.gz freeipa-1bf383e0cf424bee9dfd820b085bc148b708e834.tar.xz freeipa-1bf383e0cf424bee9dfd820b085bc148b708e834.zip | |
install: Handle Knob cli_name and cli_aliases values consistently
https://fedorahosted.org/freeipa/ticket/4468
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/install/cli.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py index b83fd9a2f..e121f3db1 100644 --- a/ipapython/install/cli.py +++ b/ipapython/install/cli.py @@ -114,8 +114,8 @@ class ConfigureTool(admintool.AdminTool): short_opt_str = '-{0}'.format(knob_cls.cli_short_name) else: short_opt_str = '' - cli_name = knob_cls.cli_name or name - opt_str = '--{0}'.format(cli_name.replace('_', '-')) + cli_name = knob_cls.cli_name or name.replace('_', '-') + opt_str = '--{0}'.format(cli_name) if not knob_cls.deprecated: help = knob_cls.description else: @@ -127,8 +127,9 @@ class ConfigureTool(admintool.AdminTool): ) if knob_cls.cli_aliases: + opt_strs = ['--{0}'.format(a) for a in knob_cls.cli_aliases] opt_group.add_option( - *knob_cls.cli_aliases, + *opt_strs, help=optparse.SUPPRESS_HELP, **kwargs ) @@ -201,8 +202,8 @@ class ConfigureTool(admintool.AdminTool): cfgr = transformed_cls(**kwargs) except core.KnobValueError as e: knob_cls = getattr(transformed_cls, e.name) - cli_name = knob_cls.cli_name or e.name - opt_str = '--{0}'.format(cli_name.replace('_', '-')) + cli_name = knob_cls.cli_name or e.name.replace('_', '-') + opt_str = '--{0}'.format(cli_name) self.option_parser.error("option {0}: {1}".format(opt_str, e)) except RuntimeError as e: self.option_parser.error(str(e)) |