Updated Branches: refs/heads/trunk 9c0da685f -> e1c40dcc2
AMBARI-3051. If user forgets "ambari-server upgrade" after upgrade and starts ambari then the error message asks to run ambari-server setup (Dmytro Shkvyra via dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/e1c40dcc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/e1c40dcc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/e1c40dcc Branch: refs/heads/trunk Commit: e1c40dcc2940bd15390f70b1e11ab1a29676b254 Parents: 9c0da68 Author: Lisnichenko Dmitro <[email protected]> Authored: Tue Sep 3 17:02:15 2013 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Tue Sep 3 17:02:15 2013 +0300 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e1c40dcc/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 7d1320c..1e2d1e3 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -2108,8 +2108,10 @@ def start(args): current_user = getpass.getuser() ambari_user = read_ambari_user() if ambari_user is None: - err = "Unable to detect a system user for Ambari Server. " \ - "Please run \"ambari-server setup\" command to create user " + err = "Unable to detect a system user for Ambari Server.\n" \ + "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" \ + "See documentation at http://docs.hortonworks.com/HDPDocuments/HDP1/HDP-1.3.2/bk_using_Ambari_book/content/ambari-chap9-3.html"; raise FatalException(1, err) if current_user != ambari_user and not is_root(): err = "Unable to start Ambari Server as user {0}. Please either run \"ambari-server start\" " \
