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

Remove IPAdmin.get_dns_sorted_by_length

Browse Source 
A simple sort(key=len) is simpler both implementation-wise and
semantics-wise.

Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
This commit is contained in:
Petr Viktorin
2013-01-21 07:03:33 -05:00
committed by Martin Kosek
parent 607ff478f5
commit b69f6983e4
3 changed files with 12 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ipaserver/install/replication.py
View File

@@ -1066,12 +1066,10 @@ class ReplicationManager(object):
filter='(krbprincipalname=*/%s@%s)' % (replica, realm)
entries = self.conn.getList(self.suffix, ldap.SCOPE_SUBTREE,
filterstr=filter)
if len(entries) != 0:
dnset = self.conn.get_dns_sorted_by_length(entries,
reverse=True)
for dns in dnset:
for dn in dns:
self.conn.deleteEntry(dn)
if entries:
entries.sort(key=len, reverse=True)
for dn in entries:
self.conn.deleteEntry(dn)
except errors.NotFound:
pass
except Exception, e:
@@ -1109,12 +1107,10 @@ class ReplicationManager(object):
try:
dn = DN(('cn', replica), ('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), self.suffix)
entries = self.conn.getList(dn, ldap.SCOPE_SUBTREE)
if len(entries) != 0:
dnset = self.conn.get_dns_sorted_by_length(entries,
reverse=True)
for dns in dnset:
for dn in dns:
self.conn.deleteEntry(dn)
if entries:
entries.sort(key=len, reverse=True)
for dn in entries:
self.conn.deleteEntry(dn)
except errors.NotFound:
pass
except Exception, e: