diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-12-01 12:49:10 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-12-04 11:07:00 -0700 |
| commit | cc8e2ebf392468831428601403f6e0ca7507c11a (patch) | |
| tree | 175d727a645ed26a8fef0c6d2b28d803663ff2df /base/server/python/pki/server/deployment/pkiparser.py | |
| parent | 7eb362d4955a12835479d2bfaa7d364ea4cd7e1f (diff) | |
| download | pki-cc8e2ebf392468831428601403f6e0ca7507c11a.tar.gz pki-cc8e2ebf392468831428601403f6e0ca7507c11a.tar.xz pki-cc8e2ebf392468831428601403f6e0ca7507c11a.zip | |
Remove legacy multilib JNI_JAR_DIR logic
* Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages not
found
(cherry picked from commit d7a0807b7493fc3d86900ee4aaf8199efd824907)
Conflicts:
base/java-tools/templates/pki_java_command_wrapper.in
base/java-tools/templates/pretty_print_cert_command_wrapper.in
base/java-tools/templates/pretty_print_crl_command_wrapper.in
base/server/python/pki/server/deployment/pkiparser.py
base/server/scripts/operations
(cherry picked from commit c8d73ade2c651fd5ca01226c89d5d19828bfc9b7)
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index 6086da0b1..92d3e66ba 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -173,7 +173,8 @@ class PKIConfigParser: # JNI jar location jni_jar_dir = subprocess.check_output( - '. /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR', + '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf ' + '&& echo $JNI_JAR_DIR', shell=True) # workaround for pylint error E1103 jni_jar_dir = str(jni_jar_dir).strip() |