Should go into master, ipa-4-3 and ipa-4-2. https://fedorahosted.org/freeipa/ticket/5945 -- David Kupka
From c980a7d0b06ec41f4151ff2b04244f1bc3c55b12 Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 9 Jun 2016 07:57:43 +0200 Subject: [PATCH 1/2] installer: positional_arguments must be tuple or list of strings
Setting string here was causing search for substring instead of search for value in tuple or list. https://fedorahosted.org/freeipa/ticket/5945 --- install/tools/ipa-replica-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 10a10827ec03a375e5d3bece0a0c6e23df8cffc0..17fc957a583739bbda386676f44209e196282a9a 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -26,7 +26,7 @@ from ipaserver.install.server import Replica ReplicaInstall = cli.install_tool( Replica, command_name='ipa-replica-install', - positional_arguments='replica_file', + positional_arguments=['replica_file'], usage='%prog [options] REPLICA_FILE', log_file_name=paths.IPAREPLICA_INSTALL_LOG, debug_option=True, -- 2.7.4
From 2304b08d60a7255e020ffdefd0f0b05c129425de Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 9 Jun 2016 07:58:32 +0200 Subject: [PATCH 2/2] installer: index() raises ValueError Expecting IndexError instead of ValueError led to traceback instead of correctly reporting the error situation. https://fedorahosted.org/freeipa/ticket/5945 --- ipapython/install/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py index aed0bc9fe12e0c56987a4e2f78d73f476dcfc2c8..9cd9ec76842b80b4f18b3282c80fb578ae09ba42 100644 --- a/ipapython/install/cli.py +++ b/ipapython/install/cli.py @@ -299,9 +299,9 @@ class ConfigureTool(admintool.AdminTool): knob_cls = knob_classes[e.name] try: if self.positional_arguments is None: - raise IndexError + raise ValueError index = self.positional_arguments.index(e.name) - except IndexError: + except ValueError: cli_name = knob_cls.cli_name or e.name.replace('_', '-') desc = "option --{0}".format(cli_name) else: -- 2.7.4
-- 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
