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.updateEntry calls from fix_replica_agreements

Browse Source 
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
This commit is contained in:
Petr Viktorin
2013-01-21 06:55:05 -05:00
committed by Martin Kosek
parent 8be8d4ebfd
commit 607ff478f5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/install/plugins/fix_replica_agreements.py
View File

@@ -80,12 +80,11 @@ class update_replica_attribute_lists(PreUpdate):
if attrlist is None: if attrlist is None:
self.log.debug("Adding %s", attribute) self.log.debug("Adding %s", attribute)
current = replica.toDict()
# Need to add it altogether # Need to add it altogether
replica[attribute] = [template % " ".join(values)] replica[attribute] = [template % " ".join(values)]
try: try:
repl.conn.updateEntry(replica.dn, current, replica.toDict()) repl.conn.update_entry(replica.dn, replica)
self.log.debug("Updated") self.log.debug("Updated")
except Exception, e: except Exception, e:
self.log.error("Error caught updating replica: %s", str(e)) self.log.error("Error caught updating replica: %s", str(e))
@@ -98,13 +97,12 @@ class update_replica_attribute_lists(PreUpdate):
if missing: if missing:
self.log.debug("%s needs updating (missing: %s)", attribute, self.log.debug("%s needs updating (missing: %s)", attribute,
', '.join(missing)) ', '.join(missing))
current = replica.toDict()
replica[attribute] = [ replica[attribute] = [
'%s %s' % (attrlist, ' '.join(missing))] '%s %s' % (attrlist, ' '.join(missing))]
try: try:
repl.conn.updateEntry(replica.dn, current, replica.toDict()) repl.conn.update_entry(replica.dn, replica)
self.log.debug("Updated %s", attribute) self.log.debug("Updated %s", attribute)
except Exception, e: except Exception, e:
self.log.error("Error caught updating %s: %s", self.log.error("Error caught updating %s: %s",