From 61887ac3929ac3bd5135867f31ad414a547327c9 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 10 Dec 2013 11:45:10 +0100 Subject: Add LDAPEntry method generate_modlist. Use LDAPEntry.generate_modlist instead of LDAPClient._generate_modlist and remove LDAPClient._generate_modlist. https://fedorahosted.org/freeipa/ticket/3488 --- ipaserver/install/ldapupdate.py | 2 +- ipaserver/install/schemaupdate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ipaserver') diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 087cfcfd..42964c04 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -718,7 +718,7 @@ class LDAPUpdate: else: # Update LDAP try: - changes = self.conn._generate_modlist(entry.dn, entry) + changes = entry.generate_modlist() if len(changes) >= 1: updated = True safe_changes = [] diff --git a/ipaserver/install/schemaupdate.py b/ipaserver/install/schemaupdate.py index f51b29b7..bb2f0f16 100644 --- a/ipaserver/install/schemaupdate.py +++ b/ipaserver/install/schemaupdate.py @@ -114,7 +114,7 @@ def update_schema(schema_files, ldapi=False, dm_password=None, live_run=True): # FIXME: We should have a better way to display the modlist, # for now display raw output of our internal routine - modlist = conn._generate_modlist(schema_entry.dn, schema_entry) + modlist = schema_entry.generate_modlist() log.debug("Complete schema modlist:\n%s", pprint.pformat(modlist)) if modified and live_run: -- cgit