On 31.05.2016 14:10, Martin Basti wrote:


On 31.05.2016 14:08, Martin Babinsky wrote:
On 05/31/2016 01:57 PM, Martin Basti wrote:


On 31.05.2016 12:44, Martin Babinsky wrote:
On 05/28/2016 01:17 PM, Martin Basti wrote:
https://fedorahosted.org/freeipa/ticket/4995

Patches attached




Hi,

PATCH 0488: LGTM

PATCH 0489:

@@ -996,10 +997,10 @@ def check_deleted_segments(hostname, masters,
topo_errors, starting_host):
         i = 0
         while True:
             left = api.Command.topologysegment_find(
-                suffix_name, iparepltoposegmentleftnode=hostname,
sizelimit=0
+                suffix_name, iparepltoposegmentleftnode=hostname,
sizelimit=0,
             )['result']
             right = api.Command.topologysegment_find(
-                suffix_name, iparepltoposegmentrightnode=hostname,
sizelimit=0
+                suffix_name, iparepltoposegmentrightnode=hostname,
sizelimit=0,
             )['result']

it seems that you added 'no_members=True' there and then removed it
because reasons. Please revert the this part to the original code so
that it does not stick out.


Better (the right one) patches attached.

ACK

master:
* 91572afc60f590f0d81ad18234189a0b48144bf5 Make option --no-members public in CLI * 5f42b42bd4557a669ab5cfcf1af6596f1a2535f1 Performance: Find commands: do not process members by default


We found and issue, I used flag 'no_cli' instead of 'no_option'

fixed and pushed under oneliner rule

master:
* 5c58751d72de27eae2181f2c0e620df03f8dbc82 Fix: replace incorrect no_cli with no_option flag


From fd94356a151fd6c75c3e228df40dba730b8d2655 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Thu, 2 Jun 2016 08:07:12 +0200
Subject: [PATCH] Fix: replace incorrect no_cli with no_option flag

The 'no_cli' is not valid flag in parameters scope, so to hide option from
CLI 'no_option' flag should be used

https://fedorahosted.org/freeipa/ticket/4995
---
 ipalib/plugins/baseldap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 9c77fd62e9a8d8c7147f5ba055f4a9f30ee8e559..bbd8ba146ead81857bbc4c2aee550b855b846be5 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -1911,7 +1911,7 @@ class LDAPSearch(BaseLDAPCommand, crud.Search):
                 # no_members are always true for find commands, do not
                 # show option in CLI but keep API compatibility
                 option = option.clone(
-                    default=True, flags=option.flags | {"no_cli"})
+                    default=True, flags=option.flags | {"no_option"})
             yield option
         if self.obj.primary_key and \
                 'no_output' not in self.obj.primary_key.flags:
-- 
2.5.5

-- 
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

Reply via email to