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:54 +0200 |
| commit | d4350c05badd20f69de5d782850cd26b9128889a (patch) | |
| tree | 2bd2a01b6f6bb806400e1ff21cacf097eb23ea9e | |
| parent | 73b23bf21d0604cdc7c0b4a37011e01a17684faf (diff) | |
| download | freeipa.git-d4350c05badd20f69de5d782850cd26b9128889a.tar.gz freeipa.git-d4350c05badd20f69de5d782850cd26b9128889a.tar.xz freeipa.git-d4350c05badd20f69de5d782850cd26b9128889a.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
| -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 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 5a92bf97..adeecfc0 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -624,6 +624,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") |