diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-08-31 17:21:25 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-09-09 16:38:52 -0400 |
| commit | f87bd57c1d3a86ade7419ea17ddee65bacda4b7f (patch) | |
| tree | 89c99bbb28e2c1965a5f58190065a2f45ae87dbf /install/tools | |
| parent | 2e8bae590eae495628ffb709540f7e83eee52ba2 (diff) | |
| download | freeipa-f87bd57c1d3a86ade7419ea17ddee65bacda4b7f.tar.gz freeipa-f87bd57c1d3a86ade7419ea17ddee65bacda4b7f.tar.xz freeipa-f87bd57c1d3a86ade7419ea17ddee65bacda4b7f.zip | |
Fix certmonger errors when doing a client or server uninstall.
This started with the client uninstaller returning a 1 when not installed.
There was no way to tell whether the uninstall failed or the client
simply wasn't installed which caused no end of grief with the installer.
This led to a lot of certmonger failures too, either trying to stop
tracking a non-existent cert or not handling an existing tracked
certificate.
I moved the certmonger code out of the installer and put it into the
client/server shared ipapython lib. It now tries a lot harder and smarter
to untrack a certificate.
ticket 142
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-server-install | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 89bb83e3d..a62f8af4e 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -381,11 +381,12 @@ def uninstall(dm_password=None): api.Backend.ldap2.connect(bind_dn="cn=Directory Manager", bind_pw=dm_password) try: - run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--uninstall"]) + (stdout, stderr, rc) = run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--uninstall"], raiseonerr=False) + if rc != 2: + raise RuntimeError(stdout) except Exception, e: print "Uninstall of client side components failed!" print "ipa-client-install returned: " + str(e) - pass ntpinstance.NTPInstance(fstore).uninstall() if cainstance.CADSInstance().is_configured(): |