Re: [Freeipa-devel] [PATCH 0212] Server Upgrade: Fix comments

2015-04-02 Thread Jan Cholasta 

Dne 24.3.2015 v 14:23 David Kupka napsal(a):

On 03/24/2015 12:04 PM, Martin Basti wrote:

On 24/03/15 09:54, Martin Basti wrote:

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



Updated patch attached



Thanks for the patch, LGTM, ACK.



Pushed to master: b5e941d49b3571a3f257be645dabb429754c94b0

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

Re: [Freeipa-devel] [PATCH 0212] Server Upgrade: Fix comments

2015-03-24 Thread David Kupka 

On 03/24/2015 12:04 PM, Martin Basti wrote:

On 24/03/15 09:54, Martin Basti wrote:

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



Updated patch attached



Thanks for the patch, LGTM, ACK.

--
David Kupka

--
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 0212] Server Upgrade: Fix comments

2015-03-24 Thread Martin Basti 

On 24/03/15 09:54, Martin Basti wrote:

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



Updated patch attached

--
Martin Basti

From 372e333c218d0e0ba8c25c14471d1445a4c1e1e3 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 | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py
index 824d32b65d5a9a809a44a2313f4e3f7328c18b0d..745171dd02e1c987a3ad147a6402eb618e308e66 100644
--- a/ipaserver/install/plugins/updateclient.py
+++ b/ipaserver/install/plugins/updateclient.py
@@ -38,10 +38,10 @@ 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
-dictionary with the following possible values:
+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
   - default: list of the default entry to be added if it doesn't
@@ -54,15 +54,15 @@ class updateclient(backend.Executioner):
   replace:krbPwdLockoutDuration:10::600
   replace: krbPwdMaxFailure:3::6
 
-Generates this update dictionary:
+Generates this list which contain the 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

Re: [Freeipa-devel] [PATCH 0212] Server Upgrade: Fix comments

2015-03-24 Thread Martin Basti 

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