diff options
| author | Martin Basti <mbasti@redhat.com> | 2014-07-21 16:54:12 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-07-28 17:42:38 +0200 |
| commit | 00309f8e424dfe814f6b69dd69844001ccce7ec5 (patch) | |
| tree | b32ff9af6dfad89f841cb503c7ebcadd9b648f82 /ipaserver | |
| parent | ab5edd0e450fdd926b7c49535424149413c3f956 (diff) | |
| download | freeipa-00309f8e424dfe814f6b69dd69844001ccce7ec5.tar.gz freeipa-00309f8e424dfe814f6b69dd69844001ccce7ec5.tar.xz freeipa-00309f8e424dfe814f6b69dd69844001ccce7ec5.zip | |
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 <pviktori@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/plugins/dns.py | 4 |
1 files changed, 4 insertions, 0 deletions
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) |