From cc8e2ebf392468831428601403f6e0ca7507c11a Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Mon, 1 Dec 2014 12:49:10 -0700 Subject: 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) --- base/server/python/pki/server/deployment/pkiparser.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'base/server/python') 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() -- cgit