summaryrefslogtreecommitdiffstats
path: root/ipapython/install
diff options
context:
space:
mode:
authorMartin Babinsky <mbabinsk@redhat.com>2015-11-06 10:05:42 +0100
committerMartin Basti <mbasti@redhat.com>2015-11-11 10:43:52 +0100
commitb6a2a1cfd2d811e4df77e5b90324d1453dab4b18 (patch)
treeba49e9d6f28c8e4d31f010508d5e1e3d0831cb50 /ipapython/install
parent9f3e8943a7c0be1ba6ae8738f8f88420a098c276 (diff)
downloadfreeipa-b6a2a1cfd2d811e4df77e5b90324d1453dab4b18.tar.gz
freeipa-b6a2a1cfd2d811e4df77e5b90324d1453dab4b18.tar.xz
freeipa-b6a2a1cfd2d811e4df77e5b90324d1453dab4b18.zip
fix error reporting when installer option is supplied with invalid choice
https://fedorahosted.org/freeipa/ticket/5433 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipapython/install')
-rw-r--r--ipapython/install/cli.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py
index d2250e516..aed0bc9fe 100644
--- a/ipapython/install/cli.py
+++ b/ipapython/install/cli.py
@@ -218,7 +218,8 @@ class ConfigureTool(admintool.AdminTool):
if value not in value_type:
raise ValueError(
"invalid choice {0} (choose from {1})".format(
- repr(value), ', '.join(repr(value_type))))
+ repr(value), ', '.join(
+ sorted(repr(v) for v in value_type))))
return value
else:
parse = value_type