From da8f51373a1ea634ed0e72bc5a15bb8dc42ec78f Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 23 Sep 2010 12:07:29 -0400 Subject: [PATCH] Remove spurious error in server uninstaller about client uninstall failure. This was meant to catch the case where the client wasn't configured and it missed the most obvious one: the client was installed and is now uninstalled. --- install/tools/ipa-server-install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index d949f44ad..6378628ce 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -384,7 +384,8 @@ def uninstall(dm_password=None): try: (stdout, stderr, rc) = run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--uninstall"], raiseonerr=False) - if rc != 2: + if rc not in [0,2]: + logging.debug("ipa-client-install returned %d" % rc) raise RuntimeError(stdout) except Exception, e: print "Uninstall of client side components failed!"