Merge github.com:dogtagpki/pki

2 files changed, 6 insertions, 22 deletions

diff --git a/base/common/python/pki/cli/main.py b/base/common/python/pki/cli/main.py
index 53e1b893a..268547bfc 100644
--- a/base/common/python/pki/cli/main.py
+++ b/base/common/python/pki/cli/main.py
@@ -21,6 +21,7 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+import os
 import shlex
 import subprocess
 import sys
@@ -70,23 +71,9 @@ class PKICLI(pki.cli.CLI):
 
     def execute_java(self, args, stdout=sys.stdout):
 
-        # read Java home
-        value = subprocess.check_output(
-            '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JAVA_HOME',
-            shell=True)
-        java_home = value.decode(sys.getfilesystemencoding()).strip()
-
-        # read PKI library
-        value = subprocess.check_output(
-            '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $PKI_LIB',
-            shell=True)
-        pki_lib = value.decode(sys.getfilesystemencoding()).strip()
-
-        # read logging configuration path
-        value = subprocess.check_output(
-            '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $LOGGING_CONFIG',
-            shell=True)
-        logging_config = value.decode(sys.getfilesystemencoding()).strip()
+        java_home = os.getenv('JAVA_HOME')
+        pki_lib = os.getenv('PKI_LIB')
+        logging_config = os.getenv('LOGGING_CONFIG')
 
         cmd = [
             java_home + '/bin/java',
@@ -122,10 +109,7 @@ class PKICLI(pki.cli.CLI):
     def execute(self, argv):
 
         # append global options
-        value = subprocess.check_output(
-            '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $PKI_CLI_OPTIONS',
-            shell=True)
-        value = value.decode(sys.getfilesystemencoding()).strip()
+        value = os.getenv('PKI_CLI_OPTIONS')
         args = shlex.split(value)
         args.extend(argv[1:])
 
diff --git a/base/common/python/pki/nssdb.py b/base/common/python/pki/nssdb.py
index 430cacd83..cad89081e 100644
--- a/base/common/python/pki/nssdb.py
+++ b/base/common/python/pki/nssdb.py
@@ -123,7 +123,7 @@ class NSSDatabase(object):
             self.password_file = password_file
 
         else:
-            raise Exception('Missing NSS database password')
+            self.password_file = None
 
         if internal_password:
             # Store the specified internal token into password file.