From aa6fb75637f1352fb0e90bccaf30f5b67caf7f0e Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 21 Jan 2013 04:56:50 -0500 Subject: Replace add_s and delete_s by their newer equivalents Part of the work for: https://fedorahosted.org/freeipa/ticket/2660 --- ipaserver/install/replication.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ipaserver/install/replication.py') diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index a9d3d9c5..c28fa890 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -306,8 +306,8 @@ class ReplicationManager(object): def delete_replication_manager(self, conn, dn=REPL_MAN_DN): assert isinstance(dn, DN) try: - conn.delete_s(dn) - except ldap.NO_SUCH_OBJECT: + conn.delete_entry(dn) + except errors.NotFound: pass def get_replica_type(self, master=True): @@ -680,12 +680,12 @@ class ReplicationManager(object): # Finally remove the temporary replication manager user try: - a.delete_s(self.repl_man_dn) - except ldap.NO_SUCH_OBJECT: + a.delete_entry(self.repl_man_dn) + except errors.NotFound: pass try: - b.delete_s(self.repl_man_dn) - except ldap.NO_SUCH_OBJECT: + b.delete_entry(self.repl_man_dn) + except errors.NotFound: pass def delete_agreement(self, hostname, dn=None): -- cgit