diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-30 13:45:50 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-30 15:01:47 -0500 |
commit | 68751fb281477190cad960d2ef4fce2d15e00798 (patch) | |
tree | 1b0b2182c3cd649a7c664648f35894bb1c652cd4 /base/deploy/src/pkispawn | |
parent | 066789642947768eceb024a4064af88efeed24b0 (diff) | |
download | pki-68751fb281477190cad960d2ef4fce2d15e00798.tar.gz pki-68751fb281477190cad960d2ef4fce2d15e00798.tar.xz pki-68751fb281477190cad960d2ef4fce2d15e00798.zip |
Refactored pkiparser.py into PKIConfigParser.
The code in pkiparser.py has been converted into PKIConfigParser
class to facilitate further improvements.
Ticket #399
Diffstat (limited to 'base/deploy/src/pkispawn')
-rwxr-xr-x | base/deploy/src/pkispawn | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn index 4ea678ef6..a687d5bef 100755 --- a/base/deploy/src/pkispawn +++ b/base/deploy/src/pkispawn @@ -36,7 +36,7 @@ try: import time from time import strftime as date from pki.deployment import pkiconfig as config - from pki.deployment import pkiparser as parse + from pki.deployment.pkiparser import PKIConfigParser from pki.deployment import pkilogging from pki.deployment import pkimessages as log except ImportError: @@ -92,7 +92,8 @@ def main(argv): pp = pprint.PrettyPrinter(indent=4) # Read and process command-line arguments. - parse.process_command_line_arguments(argv) + parser = PKIConfigParser() + parser.process_command_line_arguments(argv) if not os.path.exists(config.PKI_DEPLOYMENT_SOURCE_ROOT +\ "/" + config.pki_subsystem.lower()): @@ -133,7 +134,7 @@ def main(argv): sys.exit(1) # Read the specified PKI configuration file. - rv = parse.read_pki_configuration_file() + rv = parser.read_pki_configuration_file() if rv != 0: config.pki_log.error(PKI_UNABLE_TO_PARSE_1, rv, extra=config.PKI_INDENTATION_LEVEL_0) @@ -168,14 +169,14 @@ def main(argv): extra=config.PKI_INDENTATION_LEVEL_0) # Read in the PKI slots configuration file. - parse.compose_pki_slots_dictionary() + parser.compose_pki_slots_dictionary() config.pki_log.debug(log.PKI_DICTIONARY_SLOTS, extra=config.PKI_INDENTATION_LEVEL_0) config.pki_log.debug(pp.pformat(config.pki_slots_dict), extra=config.PKI_INDENTATION_LEVEL_0) # Combine the various sectional dictionaries into a PKI master dictionary - parse.compose_pki_master_dictionary() + parser.compose_pki_master_dictionary() if not config.pki_update_flag: config.pki_master_dict['pki_spawn_log'] = config.pki_log_dir + "/" +\ config.pki_log_name |