diff options
author | akastornov <[email protected]> | 2022-02-10 16:46:03 +0300 |
---|---|---|
committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:46:03 +0300 |
commit | 3a2de774d91ca8d7325aaf81c200b1d2047725e6 (patch) | |
tree | 5674a780ce03a8bbd794733a19c7a70d587e4a14 /library/python/testing/yatest_common/yatest/common/runtime_java.py | |
parent | 7bd11ff35e97544d119e43447e3e865f2588ee7f (diff) |
Restoring authorship annotation for <[email protected]>. Commit 1 of 2.
Diffstat (limited to 'library/python/testing/yatest_common/yatest/common/runtime_java.py')
-rw-r--r-- | library/python/testing/yatest_common/yatest/common/runtime_java.py | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/library/python/testing/yatest_common/yatest/common/runtime_java.py b/library/python/testing/yatest_common/yatest/common/runtime_java.py index 39bbb455702..88d27b8b797 100644 --- a/library/python/testing/yatest_common/yatest/common/runtime_java.py +++ b/library/python/testing/yatest_common/yatest/common/runtime_java.py @@ -1,30 +1,30 @@ -import os -import tarfile -import contextlib - +import os +import tarfile +import contextlib + from . import runtime - + _JAVA_DIR = [] -def get_java_path(jdk_dir): +def get_java_path(jdk_dir): # deprecated - to be deleted - java_paths = (os.path.join(jdk_dir, 'bin', 'java'), os.path.join(jdk_dir, 'bin', 'java.exe')) - - for p in java_paths: - if os.path.exists(p): - return p - - for f in os.listdir(jdk_dir): - if f.endswith('.tar'): - with contextlib.closing(tarfile.open(os.path.join(jdk_dir, f))) as tf: - tf.extractall(jdk_dir) - - for p in java_paths: - if os.path.exists(p): - return p - - return '' + java_paths = (os.path.join(jdk_dir, 'bin', 'java'), os.path.join(jdk_dir, 'bin', 'java.exe')) + + for p in java_paths: + if os.path.exists(p): + return p + + for f in os.listdir(jdk_dir): + if f.endswith('.tar'): + with contextlib.closing(tarfile.open(os.path.join(jdk_dir, f))) as tf: + tf.extractall(jdk_dir) + + for p in java_paths: + if os.path.exists(p): + return p + + return '' def get_build_java_dir(jdk_dir): |