From 00309f8e424dfe814f6b69dd69844001ccce7ec5 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Mon, 21 Jul 2014 16:54:12 +0200 Subject: Fix DNS upgrade plugin should check if DNS container exists Fortunately this cause no error, because dnszone-find doesnt raise exception if there is no DNS container Reviewed-By: Petr Viktorin --- ipaserver/install/plugins/dns.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ipaserver') diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py index 07c0325d7..1aef837f6 100644 --- a/ipaserver/install/plugins/dns.py +++ b/ipaserver/install/plugins/dns.py @@ -61,6 +61,8 @@ class update_dnszones(PostUpdate): def execute(self, **options): ldap = self.obj.backend + if not dns_container_exists(ldap): + return (False, False, []) try: zones = api.Command.dnszone_find(all=True)['result'] @@ -153,6 +155,8 @@ class update_check_forwardzones(PreSchemaUpdate): # no upgrade is needed return (False, False, []) ldap = self.obj.backend + if not dns_container_exists(ldap): # No DNS installed + return (False, False, []) result = ldap.schema.get_obj(_ldap.schema.models.ObjectClass, 'idnsforwardzone') if result is None: sysupgrade.set_upgrade_state('dns', 'update_to_forward_zones', True) -- cgit