Re: [Freeipa-devel] [PATCH 0094] Fix bogus error message in choice-type installer options

[Martin Basti]

On 10.11.2015 11:01, Martin Basti wrote:



On 09.11.2015 09:55, Martin Babinsky wrote:

On 11/09/2015 07:15 AM, Jan Cholasta wrote:

On 6.11.2015 17:02, Martin Babinsky wrote:

On 11/06/2015 10:30 AM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5433





Attaching updated patch.


NACK, the first patch was better, there should be quotes around the 
values.




Attaching updated patch.


ACK


Pushed to:
master: b6a2a1cfd2d811e4df77e5b90324d1453dab4b18
ipa-4-2: dc0f2d1fec8bdbe5cccebb1d3dfe403ad994e6f6

--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0094] Fix bogus error message in choice-type installer options

[Martin Basti]

On 09.11.2015 09:55, Martin Babinsky wrote:

On 11/09/2015 07:15 AM, Jan Cholasta wrote:

On 6.11.2015 17:02, Martin Babinsky wrote:

On 11/06/2015 10:30 AM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5433





Attaching updated patch.


NACK, the first patch was better, there should be quotes around the 
values.




Attaching updated patch.


ACK

--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0094] Fix bogus error message in choice-type installer options

[Jan Cholasta]

On 6.11.2015 17:02, Martin Babinsky wrote:

On 11/06/2015 10:30 AM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5433





Attaching updated patch.


NACK, the first patch was better, there should be quotes around the values.

--
Jan Cholasta

--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH 0094] Fix bogus error message in choice-type installer options

[Martin Babinsky]

https://fedorahosted.org/freeipa/ticket/5433

--
Martin^3 Babinsky
From 330cbc92b9785e68b5d5c72177fe45326c1baa86 Mon Sep 17 00:00:00 2001
From: Martin Babinsky 
Date: Fri, 6 Nov 2015 10:05:42 +0100
Subject: [PATCH] fix error reporting when installer option is supplied with
 invalid choice

https://fedorahosted.org/freeipa/ticket/5433
---
 ipapython/install/cli.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py
index d2250e51650b9de1c85473399e3462f42bf8770b..e02445a8f6edf1335c813f4f30563d7edbd88fd0 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(
+repr(v) for v in value_type)))
 return value
 else:
 parse = value_type
-- 
2.4.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0094] Fix bogus error message in choice-type installer options

[Martin Babinsky]

On 11/06/2015 10:30 AM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5433





Attaching updated patch.

--
Martin^3 Babinsky
From 72bec020ac98095836593ae7f04c922632f5c885 Mon Sep 17 00:00:00 2001
From: Martin Babinsky 
Date: Fri, 6 Nov 2015 10:05:42 +0100
Subject: [PATCH] fix error reporting when installer option is supplied with
 invalid choice

https://fedorahosted.org/freeipa/ticket/5433
---
 ipapython/install/cli.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py
index d2250e51650b9de1c85473399e3462f42bf8770b..7cc3a9c395cb9326112f9235ec24ee38ff897eb8 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
+str(value), ', '.join(
+sorted(str(v) for v in value_type
 return value
 else:
 parse = value_type
-- 
2.4.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code