From 88ac58a1ce0641e65bcc7934020f85ef39d8e82b Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Thu, 16 Jun 2016 21:53:31 +0200 Subject: [PATCH] upgrade: don't fail if zone does not exists in in find In case that zone is not managed by IPA, upgrade fails with not found error. Prevent failure in this case. Reviewed-By: Petr Spacek --- ipaserver/install/bindinstance.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index a335ff5f4..188f3dc0e 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -1037,7 +1037,11 @@ class BindInstance(service.Service): def remove_ipa_ca_cnames(self, domain_name): # get ipa-ca CNAMEs - cnames = get_rr(domain_name, IPA_CA_RECORD, "CNAME", api=self.api) + try: + cnames = get_rr(domain_name, IPA_CA_RECORD, "CNAME", api=self.api) + except errors.NotFound: + # zone does not exists + cnames = None if not cnames: return