ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-11988: NonRoot: Ambari-Server setup fails when jdk is preinstalled (jluniya)
Date Thu, 18 Jun 2015 03:04:33 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 10fb2789c -> cbf4c72d8


AMBARI-11988: NonRoot: Ambari-Server setup fails when jdk is preinstalled (jluniya)


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

Branch: refs/heads/trunk
Commit: cbf4c72d86289e1ded07a42e3130cb09114c6c54
Parents: 10fb278
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Wed Jun 17 20:04:29 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Wed Jun 17 20:04:29 2015 -0700

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari_server/setupSecurity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cbf4c72d/ambari-server/src/main/python/ambari_server/setupSecurity.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/setupSecurity.py b/ambari-server/src/main/python/ambari_server/setupSecurity.py
index 3d55aba..1bc2222 100644
--- a/ambari-server/src/main/python/ambari_server/setupSecurity.py
+++ b/ambari-server/src/main/python/ambari_server/setupSecurity.py
@@ -158,7 +158,7 @@ def adjust_directory_permissions(ambari_user):
       configDefaults.NR_ADJUST_OWNERSHIP_LIST.append((jce_file_path, "644", "{0}", False))
   if java_home:
     jdk_security_dir = os.path.abspath(os.path.join(java_home, configDefaults.JDK_SECURITY_DIR))
-    if(os.path.exists(jce_file_path)):
+    if(os.path.exists(jdk_security_dir)):
       configDefaults.NR_ADJUST_OWNERSHIP_LIST.append((jdk_security_dir, "644", "{0}", True))
       configDefaults.NR_ADJUST_OWNERSHIP_LIST.append((jdk_security_dir, "755", "{0}", False))
 


Mime
View raw message