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/java-tools/templates/pki_java_command_wrapper.in | 2 +- base/java-tools/templates/pretty_print_cert_command_wrapper.in | 2 +- base/java-tools/templates/pretty_print_crl_command_wrapper.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'base/java-tools') diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index e42d191a7..c66cb538d 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -129,7 +129,7 @@ fi ## order this command wrapper uses to find jar files. ## ############################################################################### -JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` +JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR` CP=${JNI_JAR_DIR}/jss4.jar CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in index 657fa26af..3a67e3a2a 100644 --- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -125,7 +125,7 @@ fi ## order this command wrapper uses to find jar files. ## ############################################################################### -JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` +JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR` CP=${JNI_JAR_DIR}/jss4.jar CP=/usr/share/java/commons-codec.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in index 85767a394..900a887cc 100644 --- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -125,7 +125,7 @@ fi ## order this command wrapper uses to find jar files. ## ############################################################################### -JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` +JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR` CP=${JNI_JAR_DIR}/jss4.jar CP=/usr/share/java/commons-codec.jar:${CP} -- cgit