ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [23/24] ambari git commit: AMBARI-14990. 'ambari-server setup -s' should not pickup $JAVA_HOME as jdk location (aonishuk)
Date Wed, 10 Feb 2016 16:13:20 GMT
AMBARI-14990. 'ambari-server setup -s' should not pickup $JAVA_HOME as jdk location (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46bbbf9c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46bbbf9c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46bbbf9c

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 46bbbf9c2c72b52f107d4d929ab3dc6dc05577d4
Parents: feb50e3
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Wed Feb 10 13:20:54 2016 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Wed Feb 10 13:20:54 2016 +0200

----------------------------------------------------------------------
 .../src/main/python/ambari_server/serverSetup.py   | 17 -----------------
 1 file changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/46bbbf9c/ambari-server/src/main/python/ambari_server/serverSetup.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 511da27..c370257 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -432,23 +432,6 @@ class JDKSetup(object):
     else:
       progress_func = download_progress
 
-    if get_silent():
-      if not java_home_var:
-        #No java_home_var set, detect if java is already installed
-        if os.environ.has_key(JAVA_HOME):
-          args.java_home = os.environ[JAVA_HOME]
-
-          properties.process_pair(JAVA_HOME_PROPERTY, args.java_home)
-          properties.removeOldProp(JDK_NAME_PROPERTY)
-          properties.removeOldProp(JCE_NAME_PROPERTY)
-
-          self._ensure_java_home_env_var_is_set(args.java_home)
-          self.jdk_index = self.custom_jdk_number
-          return
-        else:
-          # For now, changing the existing JDK to make sure we use a supported one
-          pass
-
     if java_home_var:
       change_jdk = get_YN_input("Do you want to change Oracle JDK [y/n] (n)? ", False)
       if not change_jdk:


Mime
View raw message