summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/pkiparser.py
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2015-01-30 15:49:27 -0500
committerEndi S. Dewata <edewata@redhat.com>2015-02-05 11:32:20 -0500
commitdfe55982eb50750fc1e65bce312d884b1604f0b4 (patch)
tree411d1316c3b4ff78e3a349bb4923bd0e2aae03c7 /base/server/python/pki/server/deployment/pkiparser.py
parent8fc5acb72ac9fdbc70b8a6e7242890f9dbeccf56 (diff)
downloadpki-dfe55982eb50750fc1e65bce312d884b1604f0b4.tar.gz
pki-dfe55982eb50750fc1e65bce312d884b1604f0b4.tar.xz
pki-dfe55982eb50750fc1e65bce312d884b1604f0b4.zip
Fixed pylint report.
Previously pylint report was saved it into a file which may not be accessible on a build system. The pylint-build-scan.sh has been changed to display the report so it will appear in the build log. The pylint configuration has also been modified to disable C and R messages by default. This way when other errors or warnings occur the build will fail without having to check for specific codes. Some Python codes have been modified to reduce the number of pylint warnings. https://fedorahosted.org/pki/ticket/703
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 92d3e66ba..1e3912084 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -619,7 +619,7 @@ class PKIConfigParser:
# and add this to the "sensitive" key value pairs read in from
# the configuration file
self.mdict['pki_one_time_pin'] = \
- ''.join(random.choice(string.ascii_letters + string.digits)
+ ''.join(random.choice(string.ascii_letters + string.digits)\
for x in range(20))
if self.mdict['pki_subsystem'] in\
config.PKI_TOMCAT_SUBSYSTEMS:
@@ -1118,8 +1118,8 @@ class PKIConfigParser:
# Stand-alone PKI
self.mdict['pki_security_domain_type'] = "new"
self.mdict['pki_issuing_ca'] = "External CA"
- elif (config.pki_subsystem != "CA" or
- config.str2bool(self.mdict['pki_clone']) or
+ elif (config.pki_subsystem != "CA" or\
+ config.str2bool(self.mdict['pki_clone']) or\
config.str2bool(self.mdict['pki_subordinate'])):
# PKI KRA, PKI OCSP, PKI RA, PKI TKS, PKI TPS,
# CA Clone, KRA Clone, OCSP Clone, TKS Clone, TPS Clone