You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/08/26 22:00:38 UTC
git commit: AMBARI-3026. Ambari server setup with silent option
prints error statement for the first time. (swagle)
Updated Branches:
refs/heads/branch-1.4 e5f2dd20d -> 618829af7
AMBARI-3026. Ambari server setup with silent option prints error statement for the first time. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/618829af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/618829af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/618829af
Branch: refs/heads/branch-1.4
Commit: 618829af77df2d69d48274a1707b46054d9b9504
Parents: e5f2dd2
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Mon Aug 26 11:29:06 2013 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Mon Aug 26 11:29:06 2013 -0700
----------------------------------------------------------------------
ambari-server/src/main/python/ambari-server.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/618829af/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 9b6bc97..ba46dac 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -1346,7 +1346,7 @@ def is_jdbc_user_changed(args):
if previos_user != new_user:
return True
else:
- print_error_msg("Connection properties not set in config file.")
+ print_error_msg("Cannot find jdbc username in config file.")
return None
return False
@@ -1965,8 +1965,6 @@ def setup(args):
#DB setup should be done last after doing any setup.
if is_local_database(args):
- #check if jdbc user is changed
- is_user_changed = is_jdbc_user_changed(args)
print 'Default properties detected. Using built-in database.'
store_local_properties(args)
@@ -1983,7 +1981,7 @@ def setup(args):
err = 'Running database init script was failed. Exiting.'
raise FatalException(retcode, err)
- if is_user_changed:
+ if is_jdbc_user_changed(args):
#remove backup for pg_hba in order to reconfigure postgres
remove_file(PG_HBA_CONF_FILE_BACKUP)