From 9c39f95f2174d8197102080314eab7a10cf8c86c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 16 Apr 2012 17:03:46 -0400 Subject: Remove the running state when uninstalling DS instances. We don't need to do anything with the state but if it exists in the sysrestore index at the end of uninstallation the uninstaller will complain about it. https://fedorahosted.org/freeipa/ticket/2637 --- ipaserver/install/cainstance.py | 3 +++ ipaserver/install/dsinstance.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 64175e48..56b84fcd 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -385,6 +385,9 @@ class CADSInstance(service.Service): enabled = self.restore_state("enabled") serverid = self.restore_state("serverid") + # Just eat this state if it exists + running = self.restore_state("running") + if not enabled is None and not enabled: ipaservices.knownservices.dirsrv.disable() diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 9af5e584..827f6913 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -627,6 +627,9 @@ class DsInstance(service.Service): enabled = self.restore_state("enabled") + # Just eat this state if it exists + running = self.restore_state("running") + try: self.fstore.restore_file("/etc/security/limits.conf") self.fstore.restore_file("/etc/sysconfig/dirsrv") -- cgit