Blame SOURCES/0089-Fix-zone-find-during-forwardzone-upgrade.patch
|
 |
e3ffab |
From 1f1c7156564e7d7c2183e54811c69bc74ff21a98 Mon Sep 17 00:00:00 2001
|
|
|
e3ffab |
From: Martin Basti <mbasti@redhat.com>
|
|
|
e3ffab |
Date: Wed, 7 Jan 2015 13:21:04 +0100
|
|
|
e3ffab |
Subject: [PATCH] Fix zone find during forwardzone upgrade
|
|
|
e3ffab |
|
|
|
e3ffab |
https://fedorahosted.org/freeipa/ticket/4818
|
|
|
e3ffab |
|
|
|
e3ffab |
Reviewed-By: Petr Spacek <pspacek@redhat.com>
|
|
|
e3ffab |
---
|
|
|
e3ffab |
ipaserver/install/plugins/dns.py | 4 ++++
|
|
|
e3ffab |
1 file changed, 4 insertions(+)
|
|
|
e3ffab |
|
|
|
e3ffab |
diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
|
|
|
e3ffab |
index ea4aec9741e4714cacdb677bd850730462623fa7..aa7bf5f0bbc0db6f10f047f390246cfbfda32b73 100644
|
|
|
e3ffab |
--- a/ipaserver/install/plugins/dns.py
|
|
|
e3ffab |
+++ b/ipaserver/install/plugins/dns.py
|
|
|
e3ffab |
@@ -198,12 +198,16 @@ class update_master_to_dnsforwardzones(PostUpdate):
|
|
|
e3ffab |
# fwzones exist, do not execute upgrade again
|
|
|
e3ffab |
return (False, False, [])
|
|
|
e3ffab |
|
|
|
e3ffab |
+ zones = []
|
|
|
e3ffab |
try:
|
|
|
e3ffab |
# raw values are required to store into ldif
|
|
|
e3ffab |
zones = api.Command.dnszone_find(all=True,
|
|
|
e3ffab |
raw=True,
|
|
|
e3ffab |
sizelimit=0)['result']
|
|
|
e3ffab |
except errors.NotFound:
|
|
|
e3ffab |
+ pass
|
|
|
e3ffab |
+
|
|
|
e3ffab |
+ if not zones:
|
|
|
e3ffab |
self.log.info('No DNS zone to update found')
|
|
|
e3ffab |
return (False, False, [])
|
|
|
e3ffab |
|
|
|
e3ffab |
--
|
|
|
e3ffab |
2.1.0
|
|
|
e3ffab |
|