From 68751fb281477190cad960d2ef4fce2d15e00798 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Fri, 30 Nov 2012 13:45:50 -0500 Subject: Refactored pkiparser.py into PKIConfigParser. The code in pkiparser.py has been converted into PKIConfigParser class to facilitate further improvements. Ticket #399 --- base/deploy/src/scriptlets/pkihelper.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'base/deploy/src/scriptlets/pkihelper.py') diff --git a/base/deploy/src/scriptlets/pkihelper.py b/base/deploy/src/scriptlets/pkihelper.py index b95269431..904e08614 100644 --- a/base/deploy/src/scriptlets/pkihelper.py +++ b/base/deploy/src/scriptlets/pkihelper.py @@ -47,7 +47,7 @@ from pkiconfig import pki_slots_dict as slots from pkiconfig import pki_selinux_config_ports as ports import pkimanifest as manifest import pkimessages as log -from pkiparser import read_simple_configuration_file +from pkiparser import PKIConfigParser # PKI Deployment Helper Functions @@ -2253,7 +2253,7 @@ class security_domain: def deregister(self, critical_failure=False): try: # process this PKI subsystem instance's 'CS.cfg' - cs_cfg = read_simple_configuration_file(master['pki_target_cs_cfg']) + cs_cfg = PKIConfigParser.read_simple_configuration_file(master['pki_target_cs_cfg']) # assign key name/value pairs machinename = cs_cfg.get('service.machineName') @@ -2331,7 +2331,7 @@ class security_domain: if os.path.exists(master['pki_shared_password_conf']) and\ os.path.isfile(master['pki_shared_password_conf']) and\ os.access(master['pki_shared_password_conf'], os.R_OK): - tokens = read_simple_configuration_file( + tokens = PKIConfigParser.read_simple_configuration_file( master['pki_shared_password_conf']) hardware_token = "hardware-" + token_name if tokens.has_key(hardware_token): -- cgit