summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2017-02-22 12:38:19 +0100
committerMartin Basti <mbasti@redhat.com>2017-02-23 10:14:49 +0100
commit32076df10231b381a80c9ef850c2c31d7a25feb8 (patch)
tree70741c069f332983103fbe8b25c45ad1c4494086
parent8c2cd66269d7be976ae7fc990343ed8e9b5282a3 (diff)
downloadfreeipa-32076df10231b381a80c9ef850c2c31d7a25feb8.tar.gz
freeipa-32076df10231b381a80c9ef850c2c31d7a25feb8.tar.xz
freeipa-32076df10231b381a80c9ef850c2c31d7a25feb8.zip
Fix ipa-server-upgrade
Running ipa-server-upgrade would fail to stop ipa_memcached if it's already uninstalled. https://fedorahosted.org/freeipa/ticket/5959 Reviewed-By: Christian Heimes <cheimes@redhat.com>
-rw-r--r--ipaserver/install/server/upgrade.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index 26f6b8ffe..e5d9de4d7 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -83,7 +83,8 @@ def uninstall_ipa_memcached():
"""
ipa_memcached = service.SimpleServiceInstance('ipa_memcached')
- ipa_memcached.uninstall()
+ if ipa_memcached.is_configured():
+ ipa_memcached.uninstall()
def backup_file(filename, ext):