IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace add_s and delete_s by their newer equivalents

Browse Source 
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
This commit is contained in:
Petr Viktorin
2013-01-21 04:56:50 -05:00
committed by Martin Kosek
parent 66c7fd1323
commit aa6fb75637
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipaserver/install/replication.py
View File

@@ -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):