You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/02/14 07:50:48 UTC
git commit: AMBARI-4537. Adjust ambari-server start check wording.
(Dmytro Shkvyra via mahadev)
Updated Branches:
refs/heads/trunk bd48dca60 -> 342b63476
AMBARI-4537. Adjust ambari-server start check wording. (Dmytro Shkvyra via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/342b6347
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/342b6347
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/342b6347
Branch: refs/heads/trunk
Commit: 342b63476ae8e44d145df1e24d35d064c4f820b5
Parents: bd48dca
Author: Mahadev Konar <ma...@apache.org>
Authored: Thu Feb 13 22:50:36 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Thu Feb 13 22:50:36 2014 -0800
----------------------------------------------------------------------
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/342b6347/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 69a6723..61233d3 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -123,10 +123,9 @@ BOLD_OFF='\033[0m'
PRESS_ENTER_MSG="Press <enter> to continue."
#Common setup or upgrade message
-SETUP_OR_UPGRADE_MSG = " If it is a new setup then only run \"ambari-server setup\" command to create user\n" \
-" If it is an upgrade then run \"ambari-server upgrade\" command.\n" \
-" For more information, see documentation at http://incubator.apache" \
-".org/ambari/current/installing-hadoop-using-ambari/content/"
+SETUP_OR_UPGRADE_MSG = "- If this is a new setup, then run the \"ambari-server setup\" command to create the user\n" \
+"- If this is an upgrade of an existing setup, run the \"ambari-server upgrade\" command.\n" \
+"Refer to the Ambari documentation for more information on setup and upgrade."
#SSL certificate metainfo
COMMON_NAME_ATTR='CN'
@@ -2014,7 +2013,7 @@ def download_jdk(args):
" all hosts have the JCE unlimited strength policy 6, files."
print_error_msg("Failed to download JCE policy files:")
if e.reason is not None:
- print_error_msg("Reason: {0}".format(e.reason))
+ print_error_msg("\nREASON: {0}".format(e.reason))
# TODO: We don't fail installation if download_jce_policy fails. Is it OK?
return 0
@@ -4324,7 +4323,7 @@ def main():
pass
except FatalException as e:
if e.reason is not None:
- print_error_msg("Exiting with exit code {0}. Reason: {1}".format(e.code, e.reason))
+ print_error_msg("Exiting with exit code {0}. \nREASON: {1}".format(e.code, e.reason))
sys.exit(e.code)
except NonFatalException as e:
options.exit_message = "Ambari Server '%s' completed with warnings." % action