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

Do not crash when replica is unreachable in ipa-restore

Browse Source 
https://fedorahosted.org/freeipa/ticket/4857

Reviewed-By: Martin Kosek <mkosek@redhat.com>
This commit is contained in:
Jan Cholasta 2015-01-27 07:38:06 +00:00 committed by Martin Kosek
parent 275fb2dcec
commit 74853b66f0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipaserver/install/ipa_restore.py
View File

@ -458,6 +458,7 @@ class Restore(admintool.AdminTool):
self.dirman_password) self.dirman_password)
except Exception, e: except Exception, e:
self.log.critical("Unable to disable agreement on %s: %s" % (master, e)) self.log.critical("Unable to disable agreement on %s: %s" % (master, e))
continue
master_dn = DN(('cn', master), ('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn) master_dn = DN(('cn', master), ('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn)
try: try:
@ -482,6 +483,7 @@ class Restore(admintool.AdminTool):
self.dirman_password) self.dirman_password)
except Exception, e: except Exception, e:
self.log.critical("Unable to disable agreement on %s: %s" % (master, e)) self.log.critical("Unable to disable agreement on %s: %s" % (master, e))
continue
host_entries = repl.find_ipa_replication_agreements() host_entries = repl.find_ipa_replication_agreements()
hosts = [rep.single_value.get('nsds5replicahost') hosts = [rep.single_value.get('nsds5replicahost')