From bede6c282e6d321c348dc2d33c6d1f9c14093a57 Mon Sep 17 00:00:00 2001
From: Gabe <redhatrises@gmail.com>
Date: May 10 2016 14:30:03 +0000
Subject: ipa-nis-manage enable: change service name from 'portmap' to 'rpcbind'


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

Reviewed-By: Abhijeet Kasurde <akasurde@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>

---

diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage
index 3aa1507..948aa00 100755
--- a/install/tools/ipa-nis-manage
+++ b/install/tools/ipa-nis-manage
@@ -144,19 +144,18 @@ def main():
                 retval = 1
 
             # Enable either the portmap or rpcbind service
-            try:
-                portmap = services.knownservices.portmap
+            portmap = services.knownservices.portmap
+            rpcbind = services.knownservices.rpcbind
+
+            if portmap.is_installed():
                 portmap.enable()
                 servicemsg = portmap.service_name
-            except ipautil.CalledProcessError as cpe:
-                if cpe.returncode == 1:
-                    try:
-                        rpcbind = services.knownservices.rpcbind
-                        rpcbind.enable()
-                        servicemsg = rpcbind.service_name
-                    except ipautil.CalledProcessError as cpe:
-                        print("Unable to enable either %s or %s" % (portmap.service_name, rpcbind.service_name))
-                        retval = 3
+            elif rpcbind.is_installed():
+                rpcbind.enable()
+                servicemsg = rpcbind.service_name
+            else:
+                print("Unable to enable either %s or %s" % (portmap.service_name, rpcbind.service_name))
+                retval = 3
 
             # The cn=config entry for the plugin may already exist but it
             # could be turned off, handle both cases.