From 92224c6e83ca7ad196478b0057b523b6f2b7d150 Mon Sep 17 00:00:00 2001

From: David Kupka <dkupka@redhat.com>

Date: Wed, 26 Aug 2015 15:10:16 +0200

Subject: [PATCH] ipactl: Do not start/stop/restart single service multiple

 times

In case multiple services are provided by single system daemon

it is not needed to start/stop/restart it mutiple time.

https://fedorahosted.org/freeipa/ticket/5248

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>

---

 install/tools/ipactl | 17 ++++++++++++++++-

 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/install/tools/ipactl b/install/tools/ipactl

index 52dfe67ddb65939bc1f431ccc67d9f03114c0454..acad7ff3771561d5dce530317b65aaf117f153a1 100755

--- a/install/tools/ipactl

+++ b/install/tools/ipactl

@@ -45,6 +45,16 @@ def check_IPA_configuration():

         raise IpactlError("IPA is not configured " +

                           "(see man pages of ipa-server-install for help)", 6)

+def deduplicate(lst):

+    new_lst = []

+    s = set(lst)

+    for i in lst:

+        if i in s:

+            s.remove(i)

+            new_lst.append(i)

+

+    return new_lst

+

 def is_dirsrv_debugging_enabled():

     """

     Check the 389-ds instance to see if debugging is enabled.

@@ -283,6 +293,7 @@ def ipa_start(options):

         # no service to start

         return

+    svc_list = deduplicate(svc_list)

     for svc in svc_list:

         svchandle = services.service(svc)

         try:

@@ -321,6 +332,7 @@ def ipa_stop(options):

             finally:

                 raise IpactlError()

+    svc_list = deduplicate(svc_list)

     for svc in reversed(svc_list):

         svchandle = services.service(svc)

         try:

@@ -398,6 +410,7 @@ def ipa_restart(options):

     if len(old_svc_list) != 0:

         # we need to definitely stop some services

+        old_svc_list = deduplicate(old_svc_list)

         for svc in reversed(old_svc_list):

             svchandle = services.service(svc)

             try:

@@ -422,7 +435,7 @@ def ipa_restart(options):

     if len(svc_list) != 0:

         # there are services to restart

-

+        svc_list = deduplicate(svc_list)

         for svc in svc_list:

             svchandle = services.service(svc)

             try:

@@ -444,6 +457,7 @@ def ipa_restart(options):

     if len(new_svc_list) != 0:

         # we still need to start some services

+        new_svc_list = deduplicate(new_svc_list)

         for svc in new_svc_list:

             svchandle = services.service(svc)

             try:

@@ -494,6 +508,7 @@ def ipa_status(options):

     if len(svc_list) == 0:

         return

+    svc_list = deduplicate(svc_list)

     for svc in svc_list:

         svchandle = services.service(svc)

         try:

-- 

2.4.3