diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2015-05-29 12:17:31 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2015-06-11 15:29:34 -0600 |
| commit | 8da79f75c9041b6391f7e100b690e4297c356d0a (patch) | |
| tree | 50a25b0afde0caecbeeb4c4202a9b3dd89d883a7 /base/java-tools/bin/pki | |
| parent | d8ce02c30834982946af80383426186b7f3a04ae (diff) | |
| download | pki-8da79f75c9041b6391f7e100b690e4297c356d0a.tar.gz pki-8da79f75c9041b6391f7e100b690e4297c356d0a.tar.xz pki-8da79f75c9041b6391f7e100b690e4297c356d0a.zip | |
Remove x86 architecture limitations
- PKI Trac Ticket #1392 - Remove i686/x86_64 architecture
Diffstat (limited to 'base/java-tools/bin/pki')
| -rw-r--r-- | base/java-tools/bin/pki | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/base/java-tools/bin/pki b/base/java-tools/bin/pki index 0bba06efb..152bf3f62 100644 --- a/base/java-tools/bin/pki +++ b/base/java-tools/bin/pki @@ -25,30 +25,6 @@ import sys def run_java_cli(args): - # construct libpath based on the architecture - arch = subprocess.check_output('arch') - arch = arch.strip() - - if arch == 'i686': - libpath = [ - '/usr/lib/jss', - '/usr/lib', - '/lib' - ] - - elif arch == 'x86_64': - libpath = [ - '/usr/lib64/jss', - '/usr/lib64', - '/lib64', - '/usr/lib/jss', - '/usr/lib', - '/lib' - ] - - else: - raise Exception('Unsupported architecture: ' + arch) - # read RESTEasy library path value = subprocess.check_output( '. /etc/pki/pki.conf && echo $RESTEASY_LIB', @@ -85,18 +61,12 @@ def run_java_cli(args): '/usr/share/java/pki/pki-cmsutil.jar', '/usr/share/java/pki/pki-certsrv.jar', '/usr/share/java/pki/pki-tools.jar', + '/usr/lib64/java/jss4.jar', + '/usr/lib/java/jss4.jar' ] - if arch == 'i686': - classpath.append('/usr/lib/java/jss4.jar') - - elif arch == 'x86_64': - classpath.append('/usr/lib64/java/jss4.jar') - classpath.append('/usr/lib/java/jss4.jar') - command = [ 'java', - '-Djava.library.path=' + (':'.join(libpath)), '-cp', ':'.join(classpath), 'com.netscape.cmstools.cli.MainCLI' |