diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-04-16 17:03:46 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-04-17 11:25:41 +0200 |
| commit | 9c39f95f2174d8197102080314eab7a10cf8c86c (patch) | |
| tree | 24549b92cf1da9d4660c63826c8e0a51eb460af7 /ipaserver | |
| parent | 568de5027b9c7057e6f71cca4a45ced9ca7a7db6 (diff) | |
| download | freeipa-9c39f95f2174d8197102080314eab7a10cf8c86c.tar.gz freeipa-9c39f95f2174d8197102080314eab7a10cf8c86c.tar.xz freeipa-9c39f95f2174d8197102080314eab7a10cf8c86c.zip | |
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
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/cainstance.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 64175e482..56b84fcd8 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 9af5e5843..827f69136 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") |