You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2015/10/19 22:14:31 UTC
yetus git commit: YETUS-96. multijdkdirs shouldn't show errors on bad
input
Repository: yetus
Updated Branches:
refs/heads/YETUS-83 9bceda806 -> 55a8946cf
YETUS-96. multijdkdirs shouldn't show errors on bad input
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/55a8946c
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/55a8946c
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/55a8946c
Branch: refs/heads/YETUS-83
Commit: 55a8946cfe8d4497148f49b69d170c73fd1d83dc
Parents: 9bceda8
Author: Allen Wittenauer <aw...@apache.org>
Authored: Mon Oct 19 11:51:13 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Mon Oct 19 13:14:25 2015 -0700
----------------------------------------------------------------------
dev-support/test-patch.d/java.sh | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/55a8946c/dev-support/test-patch.d/java.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.d/java.sh b/dev-support/test-patch.d/java.sh
index 01dfab4..e1a73c7 100755
--- a/dev-support/test-patch.d/java.sh
+++ b/dev-support/test-patch.d/java.sh
@@ -23,6 +23,12 @@ function javac_initialize
local jdkdir
local tmplist
+ # if we are in pre-docker mode, don't do any of
+ # this work since it's all going to be wrong anyway
+ if [[ "${DOCKERSUPPORT}" = "true" ]]; then
+ return 0
+ fi
+
if [[ -z ${JAVA_HOME:-} ]]; then
case ${OSTYPE} in
Darwin)
@@ -47,9 +53,13 @@ function javac_initialize
JAVA_HOME=$(cd -P -- "${JAVA_HOME}" >/dev/null && pwd -P)
for i in ${JDK_DIR_LIST}; do
- jdkdir=$(cd -P -- "${i}" >/dev/null && pwd -P)
- if [[ ${jdkdir} != "${JAVA_HOME}" ]]; then
- tmplist="${tmplist} ${jdkdir}"
+ if [[ -d "${i}" ]]; then
+ jdkdir=$(cd -P -- "${i}" >/dev/null && pwd -P)
+ if [[ ${jdkdir} != "${JAVA_HOME}" ]]; then
+ tmplist="${tmplist} ${jdkdir}"
+ fi
+ else
+ yetus_error "WARNING: Cannot locate JDK directory ${i}: ignoring"
fi
done