diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-05-06 22:13:41 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-05-07 12:02:12 -0400 |
| commit | 2876bd11dd2e2fc4fa25769d8df9407bf11689cd (patch) | |
| tree | eaf4f1d373fba1e781ce358e444fa0e8a2e92732 /ipa-client/ipa-install | |
| parent | 3bf7268d749f869d1d238caf2ee9a6c28ed40280 (diff) | |
| download | freeipa-2876bd11dd2e2fc4fa25769d8df9407bf11689cd.tar.gz freeipa-2876bd11dd2e2fc4fa25769d8df9407bf11689cd.tar.xz freeipa-2876bd11dd2e2fc4fa25769d8df9407bf11689cd.zip | |
Check to see if we are configured before uninstalling.
Allow the --force flag to override on both install and uninstall
Diffstat (limited to 'ipa-client/ipa-install')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 9d6d398e..d7ee70d0 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -172,6 +172,10 @@ def chkconfig(name, status): def uninstall(options): + if not fstore.has_files() and not options.force: + print "IPA client is not configured on this system." + return 1 + # Remove our host cert and CA cert if nickname_exists("IPA CA"): try: @@ -440,7 +444,7 @@ def main(): if options.uninstall: return uninstall(options) - if fstore.has_files(): + if fstore.has_files() and not options.force: print "IPA client is already configured on this system." return 1 |