You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/25 20:34:54 UTC
[32/39] incubator-trafodion git commit: Merge error for JAVA check!
Merge error for JAVA check!
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0205fcef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0205fcef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0205fcef
Branch: refs/heads/master
Commit: 0205fcef88c30a6a42bdc4dd2cb3f040b2ab17f6
Parents: 15fbc0b
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 21:37:02 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 21:37:02 2016 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0205fcef/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 7a63180..49637c3 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -414,7 +414,13 @@ else
#Checking if using 1.7.0_n
if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
- error="true"
+ #If Java is **less** than than 1.7.0_65 the next command will fail.
+ #Install will fail anyways if less than 1.7.0_65
+ #Will not fail if Java is 1.7.0_100 or greater
+ #Temporary fix to support Java 7 upgrades greater than 100
+ if [[ "${THIS_JVM_VER:20:3}" -lt $JAVA_65 ]]; then
+ error="true"
+ fi
fi
fi