Repository: ambari Updated Branches: refs/heads/branch-2.1 98f6ac084 -> a44c367dd
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/a44c367d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a44c367d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a44c367d Branch: refs/heads/branch-2.1 Commit: a44c367dd450cd86c0a9df12fa61ac87d9714d5a Parents: 98f6ac0 Author: Jayush Luniya <[email protected]> Authored: Wed Jun 17 20:04:29 2015 -0700 Committer: Jayush Luniya <[email protected]> Committed: Wed Jun 17 20:05:17 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/a44c367d/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))
