diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2016-08-23 13:43:24 +0200 |
|---|---|---|
| committer | David Kupka <dkupka@redhat.com> | 2016-10-06 07:06:38 +0200 |
| commit | 889f0863b80a0c13a14aa69cd8563b5adde984b2 (patch) | |
| tree | 21688e23cc68e6429c40f55989674f80a0301783 | |
| parent | 10b4b155b6b411ab339bce92c1a335b4914cfc1c (diff) | |
| download | freeipa-889f0863b80a0c13a14aa69cd8563b5adde984b2.tar.gz freeipa-889f0863b80a0c13a14aa69cd8563b5adde984b2.tar.xz freeipa-889f0863b80a0c13a14aa69cd8563b5adde984b2.zip | |
Make installer quit more nicely on external CA installation
cainstance.__spawn_instance() exits in rather weird manner on
successful external CA install. This masks the weird implementation
from the user. :-&
https://fedorahosted.org/freeipa/ticket/6230
Reviewed-By: David Kupka <dkupka@redhat.com>
| -rw-r--r-- | ipaserver/install/cainstance.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index dea111025..0b502b2b6 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -596,7 +596,7 @@ class CAInstance(DogtagInstance): if self.external == 1: print("The next step is to get %s signed by your CA and re-run %s as:" % (self.csr_file, sys.argv[0])) print("%s --external-cert-file=/path/to/signed_certificate --external-cert-file=/path/to/external_ca_certificate" % sys.argv[0]) - raise ScriptError(rval=0) + sys.exit(0) else: shutil.move(paths.CA_BACKUP_KEYS_P12, paths.CACERT_P12) |