summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2017-03-13 14:40:38 +0100
committerMartin Basti <mbasti@redhat.com>2017-03-14 15:02:42 +0100
commit8980f4098ebf6b62556e24f090718802d1e495d3 (patch)
treef6d4801db9da0cebdc77c3e818bb2e9dd2a6663c
parent992e6ecd1ff33f4f872e8f174bd426507c55f5c4 (diff)
downloadfreeipa-8980f4098ebf6b62556e24f090718802d1e495d3.tar.gz
freeipa-8980f4098ebf6b62556e24f090718802d1e495d3.tar.xz
freeipa-8980f4098ebf6b62556e24f090718802d1e495d3.zip
Don't fail more if cert req/cert creation failed
This should help debugging issues that could happen during server certificate creation. https://pagure.io/freeipa/issue/6755 Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r--ipaserver/install/certs.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 660da795f..63e7887c4 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -368,8 +368,11 @@ class CertDB(object):
with open(self.certder_fname, "r") as f:
dercert = f.read()
finally:
- os.unlink(self.certreq_fname)
- os.unlink(self.certder_fname)
+ for fname in (self.certreq_fname, self.certder_fname):
+ try:
+ os.unlink(fname)
+ except OSError:
+ pass
return dercert