Commit 247a4d09 by Jon Maron

BUG-37749 use environ.get() to avoid KeyError when accessing env var JAVA_HOME

parent 32fcfddc
...@@ -110,7 +110,7 @@ def executeEnvSh(confDir): ...@@ -110,7 +110,7 @@ def executeEnvSh(confDir):
proc.communicate() proc.communicate()
def java(classname, args, classpath, jvm_opts_list, logdir=None): def java(classname, args, classpath, jvm_opts_list, logdir=None):
if os.environ["JAVA_HOME"] is not None and os.environ["JAVA_HOME"]: if os.environ.get("JAVA_HOME") is not None and os.environ["JAVA_HOME"]:
prg = os.path.join(os.environ["JAVA_HOME"], "bin", "java") prg = os.path.join(os.environ["JAVA_HOME"], "bin", "java")
else: else:
prg = which("java") prg = which("java")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment