On 23/03/15 15:36, Martin Basti wrote:
Attached patch fixes comments which I forgot to edit in 'make upgrade deterministic' patchset
I missed some dictionaries which should be lists. Updated patch attached. -- Martin Basti
From dca6c44fbe6f316d59e3b3e6a4b84c69abaee1fe Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Tue, 17 Mar 2015 18:00:00 +0100 Subject: [PATCH] Server Upgrade: Fix comments https://fedorahosted.org/freeipa/ticket/4904 --- ipaserver/install/plugins/updateclient.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py index 824d32b65d5a9a809a44a2313f4e3f7328c18b0d..6e90535dc4b36b3dde81911241f187cf4e161381 100644 --- a/ipaserver/install/plugins/updateclient.py +++ b/ipaserver/install/plugins/updateclient.py @@ -38,9 +38,9 @@ class updateclient(backend.Executioner): returns. Otherwise the update is cached until all plugins of that update type are complete, then they are applied together. - 3. updates: A dictionary of updates to be applied. + 3. updates: A list of updates to be applied. - updates is a dictionary keyed on dn. The value of an update is a + The value of an update is a dictionary with the following possible values: - dn: DN, equal to the dn attribute - updates: list of updates against the dn @@ -54,15 +54,15 @@ class updateclient(backend.Executioner): replace:krbPwdLockoutDuration:10::600 replace: krbPwdMaxFailure:3::6 - Generates this update dictionary: + Generates this list containing a update dictionary: - dict('cn=global_policy,cn=EXAMPLE.COM,cn=kerberos,dc=example,dc=com': + [ dict( 'dn': 'cn=global_policy,cn=EXAMPLE.COM,cn=kerberos,dc=example,dc=com', 'updates': ['replace:krbPwdLockoutDuration:10::600', 'replace:krbPwdMaxFailure:3::6'] ) - ) + ] Here is another example showing how a default entry is configured: @@ -73,7 +73,7 @@ class updateclient(backend.Executioner): This generates: - dict('cn=Managed Entries,cn=etc,dc=example,dc=com', + [ dict( 'dn': 'cn=Managed Entries,cn=etc,dc=example,dc=com', 'default': ['objectClass:nsContainer', @@ -81,7 +81,7 @@ class updateclient(backend.Executioner): 'cn:Managed Entries' ] ) - ) + ] Note that the variable substitution in both examples has been completed. -- 2.1.0
-- 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
