Repository: ambari Updated Branches: refs/heads/branch-1.7.0 fe3db8f41 -> 87f687c36 refs/heads/trunk 3f1c15ce5 -> 0d2a34daa
AMBARI-7659. Security: clarify Ambari automatic download + use of JCE. Fixed intendation Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d2a34da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d2a34da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d2a34da Branch: refs/heads/trunk Commit: 0d2a34daad9b235d41e446874c8afdb7d184dec7 Parents: 3f1c15c Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Oct 9 17:39:34 2014 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Oct 9 18:18:58 2014 +0300 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0d2a34da/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index a4bca0e..5480399 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -1808,12 +1808,11 @@ def download_jdk(args): raise FatalException(1, err) jdk_num = str(JDK_INDEX + 1) jdk_num = get_validated_string_input( - """ - [1] - Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7 - [2] - Oracle JDK 1.6 + Java Cryptography Extension (JCE) Policy Files 6 - [3] - Custom JDK - ============================================================================== - Enter choice (""" + jdk_num + "):", +"""[1] - Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7 +[2] - Oracle JDK 1.6 + Java Cryptography Extension (JCE) Policy Files 6 +[3] - Custom JDK +============================================================================== +Enter choice (""" + jdk_num + "):", jdk_num, "^[123]$", "Invalid number.",
