Upgrade fix: masking named should be executed only once

There was error in code, masking was executed more times, even it was
succesful

https://fedorahosted.org/freeipa/ticket/4755

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Martin Basti 2014-11-12 12:09:27 +01:00 committed by Petr Vobornik
parent e4f014dfa0
commit 29ff2868cd

View File

@ -1081,7 +1081,11 @@ def uninstall_selfsign(ds, http):
def mask_named_regular(): def mask_named_regular():
"""Disable named, we need to run only named-pkcs11, running both named and """Disable named, we need to run only named-pkcs11, running both named and
named-pkcs can cause unexpected errors""" named-pkcs can cause unexpected errors"""
if not sysupgrade.get_upgrade_state('dns', 'regular_named_masked'): if sysupgrade.get_upgrade_state('dns', 'regular_named_masked'):
return False
sysupgrade.set_upgrade_state('dns', 'regular_named_masked', True)
if bindinstance.named_conf_exists(): if bindinstance.named_conf_exists():
root_logger.info('[Masking named]') root_logger.info('[Masking named]')
named = services.service('named-regular') named = services.service('named-regular')
@ -1097,8 +1101,6 @@ def mask_named_regular():
return True return True
sysupgrade.set_upgrade_state('dns', 'regular_named_masked', True)
return False return False