From deb70d5b13ce0e7ec77debb4aa17d75df4c1dedd Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 27 Jan 2015 07:38:06 +0000 Subject: [PATCH] Do not crash when replica is unreachable in ipa-restore https://fedorahosted.org/freeipa/ticket/4857 Reviewed-By: Martin Kosek --- ipaserver/install/ipa_restore.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index de926b1a2..eec97781a 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -457,6 +457,7 @@ class Restore(admintool.AdminTool): self.dirman_password) except Exception, 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) try: @@ -481,6 +482,7 @@ class Restore(admintool.AdminTool): self.dirman_password) except Exception, e: self.log.critical("Unable to disable agreement on %s: %s" % (master, e)) + continue host_entries = repl.find_ipa_replication_agreements() hosts = [rep.single_value.get('nsds5replicahost')