diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-09-23 12:07:29 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-09-24 15:31:44 -0400 |
| commit | da8f51373a1ea634ed0e72bc5a15bb8dc42ec78f (patch) | |
| tree | d2556f6dcba650329260439c0652b8df7d6453f4 /install/tools | |
| parent | a67b524510f66ce112192261f60adf88d07fa96c (diff) | |
| download | freeipa-da8f51373a1ea634ed0e72bc5a15bb8dc42ec78f.tar.gz freeipa-da8f51373a1ea634ed0e72bc5a15bb8dc42ec78f.tar.xz freeipa-da8f51373a1ea634ed0e72bc5a15bb8dc42ec78f.zip | |
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.
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-server-install | 3 |
1 files changed, 2 insertions, 1 deletions
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!" |