summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-12-10 11:09:56 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-01-10 14:38:29 +0100
commit7b3d9be388f8e3da3959912061513e40b31926c5 (patch)
treeb1f404bc20742b0b4999f7d2d481343a16be42f1
parentd1873a5a1324e265360f1cc30eb288db9f0ad91a (diff)
downloadfreeipa-7b3d9be388f8e3da3959912061513e40b31926c5.tar.gz
freeipa-7b3d9be388f8e3da3959912061513e40b31926c5.tar.xz
freeipa-7b3d9be388f8e3da3959912061513e40b31926c5.zip
Rename LDAPEntry method commit to reset_modlist.
https://fedorahosted.org/freeipa/ticket/3488
-rw-r--r--ipapython/ipaldap.py2
-rw-r--r--ipaserver/install/ldapupdate.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index a48879f0..699a53d0 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -740,7 +740,7 @@ class LDAPEntry(collections.MutableMapping):
return result
- def commit(self):
+ def reset_modlist(self):
"""
Make the current state of the entry a new reference point for change
tracking.
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 87bd0c8f..0c44a85a 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -281,7 +281,7 @@ class LDAPUpdate:
def _entry_to_entity(self, ent):
entry = ent.copy()
- entry.commit()
+ entry.reset_modlist()
return entry
def _combine_updates(self, all_updates, update):