summaryrefslogtreecommitdiffstats
path: root/base/server
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2013-06-26 23:48:22 -0400
committerAde Lee <alee@redhat.com>2013-06-26 23:48:22 -0400
commit3e1d74f6ddf90e2499420add9bb9bfafa968722a (patch)
tree973fbdda9aedd3eba81a5eaa36c90612881f04eb /base/server
parente02ee210e3808fce149b4dd23e4d9fd35f03d755 (diff)
downloadpki-3e1d74f6ddf90e2499420add9bb9bfafa968722a.tar.gz
pki-3e1d74f6ddf90e2499420add9bb9bfafa968722a.tar.xz
pki-3e1d74f6ddf90e2499420add9bb9bfafa968722a.zip
Modify pkispawn to handle case where no subsystemCerts are generated
When installing clone of a KRA into an existing instance, no new system certs are generated, and so the systemCerts parameter is not populated. This patch addresses this issue.
Diffstat (limited to 'base/server')
-rw-r--r--base/server/src/engine/pkihelper.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/base/server/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py
index 8ca83be67..bede35816 100644
--- a/base/server/src/engine/pkihelper.py
+++ b/base/server/src/engine/pkihelper.py
@@ -3036,7 +3036,14 @@ class config_client:
config.pki_log.debug(log.PKI_CONFIG_RESPONSE_STATUS + \
" " + str(response['status']),
extra = config.PKI_INDENTATION_LEVEL_2)
- certs = response['systemCerts']
+ try:
+ certs = response['systemCerts']
+ except KeyError:
+ # no system certs created
+ config.pki_log.debug("No new system certificates generated.",
+ extra=config.PKI_INDENTATION_LEVEL_2)
+ certs = []
+
if not isinstance(certs, types.ListType):
certs = [certs]
for cdata in certs: