--
David Kupka
From 0269a920231a992b67da713d40e29a28fdd32430 Mon Sep 17 00:00:00 2001
From: David Kupka <dku...@redhat.com>
Date: Thu, 6 Nov 2014 17:57:26 -0500
Subject: [PATCH] Remove unneeded internal methods. Move code to public
methods.
---
ipaplatform/base/services.py | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py
index 961c368e6b4d81d337cf0a8601075f052352ecbf..01d95b39cc7b845bdc612d40b3eea29d6de2961a 100644
--- a/ipaplatform/base/services.py
+++ b/ipaplatform/base/services.py
@@ -436,7 +436,11 @@ class SystemdService(PlatformService):
except:
pass
else:
- self.__disable(instance_name)
+ try:
+ ipautil.run([paths.SYSTEMCTL, "disable",
+ self.service_instance(instance_name)])
+ except ipautil.CalledProcessError:
+ pass
def mask(self, instance_name=""):
if instance_name != "":
@@ -444,40 +448,26 @@ class SystemdService(PlatformService):
# remove instance file or link before masking
if os.path.islink(srv_tgt):
os.unlink(srv_tgt)
-
- self.__mask(instance_name)
-
- def unmask(self, instance_name=""):
- self.__unmask(instance_name)
-
- def __enable(self, instance_name=""):
- try:
- ipautil.run([paths.SYSTEMCTL, "enable",
- self.service_instance(instance_name)])
- except ipautil.CalledProcessError:
- pass
-
- def __disable(self, instance_name=""):
- try:
- ipautil.run([paths.SYSTEMCTL, "disable",
- self.service_instance(instance_name)])
- except ipautil.CalledProcessError:
- pass
-
- def __mask(self, instance_name=""):
try:
ipautil.run([paths.SYSTEMCTL, "mask",
self.service_instance(instance_name)])
except ipautil.CalledProcessError:
pass
- def __unmask(self, instance_name=""):
+ def unmask(self, instance_name=""):
try:
ipautil.run([paths.SYSTEMCTL, "unmask",
self.service_instance(instance_name)])
except ipautil.CalledProcessError:
pass
+ def __enable(self, instance_name=""):
+ try:
+ ipautil.run([paths.SYSTEMCTL, "enable",
+ self.service_instance(instance_name)])
+ except ipautil.CalledProcessError:
+ pass
+
def install(self):
self.enable()
--
2.1.0
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
