diff options
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/__init__.py | 6 | ||||
| -rw-r--r-- | base/server/python/pki/server/upgrade.py | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index 759b01836..c60c5a325 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -25,8 +25,8 @@ import os import pki INSTANCE_BASE_DIR = '/var/lib/pki' -REGISTRY_DIR = '/etc/sysconfig/pki' -SUBSYSTEM_TYPES = ['ca', 'kra', 'ocsp', 'tks'] +REGISTRY_DIR = '/etc/sysconfig/pki' +SUBSYSTEM_TYPES = ['ca', 'kra', 'ocsp', 'tks'] class PKISubsystem(object): @@ -84,7 +84,7 @@ class PKIInstance(object): class PKIServerException(pki.PKIException): - def __init__(self, message, exception=None,\ + def __init__(self, message, exception=None, \ instance=None, subsystem=None): pki.PKIException.__init__(self, message, exception) diff --git a/base/server/python/pki/server/upgrade.py b/base/server/python/pki/server/upgrade.py index 940dbe44a..5de961df3 100644 --- a/base/server/python/pki/server/upgrade.py +++ b/base/server/python/pki/server/upgrade.py @@ -28,10 +28,10 @@ import pki.server from pki.upgrade import verbose -UPGRADE_DIR = pki.SHARE_DIR + '/server/upgrade' -BACKUP_DIR = pki.LOG_DIR + '/server/upgrade' +UPGRADE_DIR = pki.SHARE_DIR + '/server/upgrade' +BACKUP_DIR = pki.LOG_DIR + '/server/upgrade' -INSTANCE_TRACKER = '%s/tomcat.conf' +INSTANCE_TRACKER = '%s/tomcat.conf' SUBSYSTEM_TRACKER = '%s/CS.cfg' @@ -168,8 +168,8 @@ class PKIServerUpgrader(pki.upgrade.PKIUpgrader): list = [] - if not self.instanceType or self.instanceType >=10: - if os.path.exists(os.path.join(pki.server.REGISTRY_DIR,'tomcat')): + if not self.instanceType or self.instanceType >= 10: + if os.path.exists(os.path.join(pki.server.REGISTRY_DIR, 'tomcat')): for instanceName in os.listdir(pki.server.INSTANCE_BASE_DIR): if not self.instanceName or \ self.instanceName == instanceName: |