summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/scriptlets/pkijython.py
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-18 14:46:41 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2013-01-02 01:12:06 -0500
commitd7f98cd28e7329f08413fd367be2d6eb15fe039f (patch)
treed0c92392a73c176c6d49cdf2b7896cac07ed8a95 /base/deploy/src/scriptlets/pkijython.py
parent87af59c01bf14c4c5f9765cce7b52d17f62583ae (diff)
downloadpki-ticket-380-1.tar.gz
pki-ticket-380-1.tar.xz
pki-ticket-380-1.zip
Added interactive subsystem installation.ticket-380-1
The pkispawn has been modified such that if there is no configuration file specified it will enter an interactive mode. Ticket #380
Diffstat (limited to 'base/deploy/src/scriptlets/pkijython.py')
-rw-r--r--base/deploy/src/scriptlets/pkijython.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py
index fac352fdb..59e52f15c 100644
--- a/base/deploy/src/scriptlets/pkijython.py
+++ b/base/deploy/src/scriptlets/pkijython.py
@@ -560,9 +560,7 @@ class rest_client:
javasystem.out.println(log.PKI_JYTHON_RESPONSE_ADMIN_CERT +\
" " + admin_cert)
# Store the Administration Certificate in a file
- admin_cert_file = os.path.join(
- master['pki_client_dir'],
- master['pki_client_admin_cert'])
+ admin_cert_file = master['pki_client_admin_cert']
admin_cert_bin_file = admin_cert_file + ".der"
javasystem.out.println(log.PKI_JYTHON_ADMIN_CERT_SAVE +\
" " + "'" + admin_cert_file + "'")
@@ -612,11 +610,12 @@ class rest_client:
javasystem.out.println(
log.PKI_JYTHON_ADMIN_CERT_IMPORT +\
" " + "'" + command + "'")
+ print "pos 4: " + command
os.system(command)
# create directory for p12 file if it does not exist
- self.mkdirs(os.path.dirname(
- master['pki_client_admin_cert_p12']))
+ # self.mkdirs(os.path.dirname(
+ # master['pki_client_admin_cert_p12']))
# Export the Administration Certificate from the
# client NSS security database into a PKCS #12 file