From b6a2a1cfd2d811e4df77e5b90324d1453dab4b18 Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabinsk@redhat.com>
Date: Nov 11 2015 09:43:52 +0000
Subject: 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>

---

diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py
index d2250e5..aed0bc9 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