diff options
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 6 | ||||
| -rw-r--r-- | base/server/python/pki/server/upgrade.py | 4 | ||||
| -rwxr-xr-x | base/server/sbin/pkidestroy | 4 | ||||
| -rwxr-xr-x | base/server/sbin/pkispawn | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index 9bce634f9..8348648e5 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -251,7 +251,7 @@ class PKIConfigParser: def read_text(self, message, section=None, key=None, default=None, - options=None, sign=':', allowEmpty=True, caseSensitive=True): + options=None, sign=':', allow_empty=True, case_sensitive=True): if default is None and key is not None: default = self.pki_master_dict[key] @@ -265,7 +265,7 @@ class PKIConfigParser: value = value.strip() if len(value) == 0: # empty value - if allowEmpty: + if allow_empty: value = default done = True break @@ -273,7 +273,7 @@ class PKIConfigParser: else: # non-empty value if options is not None: for v in options: - if caseSensitive: + if case_sensitive: if v == value: done = True break diff --git a/base/server/python/pki/server/upgrade.py b/base/server/python/pki/server/upgrade.py index a9911b6ed..57662b5d2 100644 --- a/base/server/python/pki/server/upgrade.py +++ b/base/server/python/pki/server/upgrade.py @@ -98,7 +98,7 @@ class PKIServerUpgradeScriptlet(pki.upgrade.PKIUpgradeScriptlet): print message else: result = pki.read_text(message + ' Continue (Yes/No)', - options=['Y', 'N'], default='Y', delimiter='?', caseSensitive=False).lower() + options=['Y', 'N'], default='Y', delimiter='?', case_sensitive=False).lower() if result == 'y': continue raise pki.server.PKIServerException( @@ -128,7 +128,7 @@ class PKIServerUpgradeScriptlet(pki.upgrade.PKIUpgradeScriptlet): print message else: result = pki.read_text(message + ' Continue (Yes/No)', - options=['Y', 'N'], default='Y', delimiter='?', caseSensitive=False).lower() + options=['Y', 'N'], default='Y', delimiter='?', case_sensitive=False).lower() if result == 'y': continue raise pki.server.PKIServerException( diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy index 79b1c229f..16479f9fd 100755 --- a/base/server/sbin/pkidestroy +++ b/base/server/sbin/pkidestroy @@ -132,7 +132,7 @@ def main(argv): interactive = True config.pki_subsystem = parser.read_text('Subsystem (CA/KRA/OCSP/TKS/TPS)', options=['CA', 'KRA', 'OCSP', 'TKS', 'TPS'], - default='CA', caseSensitive=False).upper() + default='CA', case_sensitive=False).upper() else: config.pki_subsystem = str(args.pki_subsystem).strip('[\']') @@ -149,7 +149,7 @@ def main(argv): begin = parser.read_text('Begin uninstallation (Yes/No/Quit)', options=['Yes', 'Y', 'No', 'N', 'Quit', 'Q'], - sign='?', allowEmpty=False, caseSensitive=False).lower() + sign='?', allow_empty=False, case_sensitive=False).lower() print diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index 8e56ad101..d2905dc19 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -130,7 +130,7 @@ def main(argv): config.pki_subsystem = parser.read_text('Subsystem (CA/KRA/OCSP/TKS/TPS)', options=['CA', 'KRA', 'OCSP', 'TKS', 'TPS'], - default='CA', caseSensitive=False).upper() + default='CA', case_sensitive=False).upper() print else: config.pki_subsystem = str(args.pki_subsystem).strip('[\']') @@ -167,7 +167,7 @@ def main(argv): import_cert = parser.read_text('Import certificate (Yes/No)', default=import_cert, options=['Yes', 'Y', 'No', 'N'], - sign='?', caseSensitive=False).lower() + sign='?', case_sensitive=False).lower() if import_cert == 'y' or import_cert == 'yes': parser.set_property(config.pki_subsystem, 'pki_import_admin_cert', 'True') @@ -203,7 +203,7 @@ def main(argv): remove = parser.read_text('Base DN already exists. Overwrite (Yes/No/Quit)', options=['Yes', 'Y', 'No', 'N', 'Quit', 'Q'], - sign='?', allowEmpty=False, caseSensitive=False).lower() + sign='?', allow_empty=False, case_sensitive=False).lower() if remove == 'q' or remove == 'quit': print "Installation canceled." @@ -271,7 +271,7 @@ def main(argv): while True: keygen = parser.read_text('Enable server side key generation (Yes/No)', options=['Yes', 'Y', 'No', 'N'], default='N', - sign='?', caseSensitive=False).lower() + sign='?', case_sensitive=False).lower() if keygen == 'y' or keygen == 'yes': parser.set_property(config.pki_subsystem, 'pki_enable_server_side_keygen', 'True') @@ -295,7 +295,7 @@ def main(argv): while True: parser.read_text('Hostname', config.pki_subsystem, 'pki_authdb_hostname') parser.read_text('Port', config.pki_subsystem, 'pki_authdb_port') - basedn = parser.read_text('Base DN', allowEmpty=False) + basedn = parser.read_text('Base DN', allow_empty=False) parser.set_property(config.pki_subsystem, 'pki_authdb_basedn', basedn) try: @@ -315,7 +315,7 @@ def main(argv): begin = parser.read_text('Begin installation (Yes/No/Quit)', options=['Yes', 'Y', 'No', 'N', 'Quit', 'Q'], - sign='?', allowEmpty=False, caseSensitive=False).lower() + sign='?', allow_empty=False, case_sensitive=False).lower() print if begin == 'q' or begin == 'quit': |