diff options
| author | Ana Krivokapic <akrivoka@redhat.com> | 2013-07-17 16:30:15 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-07-18 13:37:40 +0200 |
| commit | f637d05a182c0e8e73ac2048ce11e2603b0f2b4c (patch) | |
| tree | 4e60d32c713c36291d2d846ae602e59599d69b7f /ipaserver/install/installutils.py | |
| parent | 240b12169b9a52113426f6b7893ea9c6bfaf4ea4 (diff) | |
| download | freeipa.git-f637d05a182c0e8e73ac2048ce11e2603b0f2b4c.tar.gz freeipa.git-f637d05a182c0e8e73ac2048ce11e2603b0f2b4c.tar.xz freeipa.git-f637d05a182c0e8e73ac2048ce11e2603b0f2b4c.zip | |
Properly handle non-existent cert files
https://fedorahosted.org/freeipa/ticket/3785
Diffstat (limited to 'ipaserver/install/installutils.py')
| -rw-r--r-- | ipaserver/install/installutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index a716525b..d23f9b57 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -721,7 +721,7 @@ def check_pkcs12(pkcs12_info, ca_file, hostname): ca_cert_name = 'The Root CA' try: nssdb.import_pem_cert(ca_cert_name, "CT,C,C", ca_file) - except ValueError, e: + except (ValueError, RuntimeError) as e: raise ScriptError(str(e)) # Import everything in the PKCS#12 |