From a641e279ff76e09f59c4d5fef1dc1f9355dbacf7 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Thu, 27 Oct 2016 09:23:22 +0200 Subject: install: improve CLI positional argument handling Instead of specifying which knobs should be positional arguments in cli.install_tool(), do it using a flag in knob definition, where the rest of CLI configuration is. As a side effect, the usage string for CLI tools can now be generated automatically. https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Martin Basti --- ipapython/install/core.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ipapython/install/core.py') diff --git a/ipapython/install/core.py b/ipapython/install/core.py index e94c0f2c0..0a208ca66 100644 --- a/ipapython/install/core.py +++ b/ipapython/install/core.py @@ -110,6 +110,7 @@ class KnobBase(PropertyBase): sensitive = False deprecated = False description = None + cli_positional = False cli_name = None cli_short_name = None cli_aliases = None @@ -141,8 +142,9 @@ class KnobBase(PropertyBase): def Knob(type_or_base, default=_missing, sensitive=_missing, - deprecated=_missing, description=_missing, cli_name=_missing, - cli_short_name=_missing, cli_aliases=_missing, cli_metavar=_missing): + deprecated=_missing, description=_missing, cli_positional=_missing, + cli_name=_missing, cli_short_name=_missing, cli_aliases=_missing, + cli_metavar=_missing): class_dict = {} class_dict['_order'] = next(_counter) @@ -159,6 +161,8 @@ def Knob(type_or_base, default=_missing, sensitive=_missing, class_dict['deprecated'] = deprecated if description is not _missing: class_dict['description'] = description + if cli_positional is not _missing: + class_dict['cli_positional'] = cli_positional if cli_name is not _missing: class_dict['cli_name'] = cli_name if cli_short_name is not _missing: -- cgit