diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-23 09:35:55 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:45 +0100 |
| commit | e815c1893d4f8118c1308cb7e306826442988863 (patch) | |
| tree | ff9d3c447d63481229dd809e1ffb021ac3d3a990 /ipaserver/install/replication.py | |
| parent | f8ad7cb96f065ca0dc557d8be95fd33a95d34d17 (diff) | |
| download | freeipa.git-e815c1893d4f8118c1308cb7e306826442988863.tar.gz freeipa.git-e815c1893d4f8118c1308cb7e306826442988863.tar.xz freeipa.git-e815c1893d4f8118c1308cb7e306826442988863.zip | |
Replace deleteEntry with delete_entry
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/replication.py')
| -rw-r--r-- | ipaserver/install/replication.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 570471d6..332b8822 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -734,7 +734,7 @@ class ReplicationManager(object): """ if dn is None: cn, dn = self.agreement_dn(hostname) - return self.conn.deleteEntry(dn) + return self.conn.delete_entry(dn) def delete_referral(self, hostname): dn = DN(('cn', self.suffix), ('cn', 'mapping tree'), ('cn', 'config')) @@ -1094,8 +1094,8 @@ class ReplicationManager(object): filter='(krbprincipalname=*/%s@%s)' % (replica, realm)) if entries: entries.sort(key=len, reverse=True) - for dn in entries: - self.conn.deleteEntry(dn) + for entry in entries: + self.conn.delete_entry(entry) except errors.NotFound: pass except Exception, e: @@ -1136,8 +1136,8 @@ class ReplicationManager(object): entries = self.conn.get_entries(dn, ldap.SCOPE_SUBTREE) if entries: entries.sort(key=len, reverse=True) - for dn in entries: - self.conn.deleteEntry(dn) + for entry in entries: + self.conn.delete_entry(entry) except errors.NotFound: pass except Exception, e: @@ -1152,8 +1152,8 @@ class ReplicationManager(object): entries = self.conn.get_entries( basedn, ldap.SCOPE_SUBTREE, filter=filter) if len(entries) != 0: - for e in entries: - self.conn.deleteEntry(e.dn) + for entry in entries: + self.conn.delete_entry(entry) except errors.NotFound: pass except Exception, e: |