diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2011-10-04 15:17:58 +0300 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-10-03 16:40:57 -0400 |
| commit | 8f5d806b812f443ce90a0fe0f136d37bc4faf62c (patch) | |
| tree | 7935a53ff219f205f7b193201c8f1e4a814b4e7a | |
| parent | 844d4ff8bfb933ad8121d32343ae8418a79839cd (diff) | |
| download | freeipa-8f5d806b812f443ce90a0fe0f136d37bc4faf62c.tar.gz freeipa-8f5d806b812f443ce90a0fe0f136d37bc4faf62c.tar.xz freeipa-8f5d806b812f443ce90a0fe0f136d37bc4faf62c.zip | |
Unroll StrEnum values when displaying help
https://fedorahosted.org/freeipa/ticket/1848
| -rw-r--r-- | ipalib/cli.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index 86365e7ca..06e7b1c47 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -48,7 +48,7 @@ import plugable import util from errors import PublicError, CommandError, HelpError, InternalError, NoSuchNamespaceError, ValidationError, NotFound, NotConfiguredError from constants import CLI_TAB -from parameters import Password, Bytes, File, Str +from parameters import Password, Bytes, File, Str, StrEnum from text import _ from ipapython.version import API_VERSION @@ -1008,8 +1008,11 @@ class cli(backend.Executioner): kw['action'] = 'store_false' else: kw['action'] = 'store_true' + elif isinstance(option, StrEnum): + kw['metavar'] = metavar=map(lambda x: str(x), option.values) else: kw['metavar'] = metavar=option.__class__.__name__.upper() + if option.cli_short_name: o = optparse.make_option('-%s' % option.cli_short_name, '--%s' % to_cli(option.cli_name), **kw) else: |