Repository: ambari Updated Branches: refs/heads/branch-2.0.maint 97f91e7f5 -> c32403f90 refs/heads/trunk 57ba7014a -> 43e792cfc
AMBARI-10762. Ambari Upgrade fails if existing properties file has content as attached in here. Ambari 1.7 to 2.0 Upgrade (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/43e792cf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43e792cf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43e792cf Branch: refs/heads/trunk Commit: 43e792cfc710f0f699b854771090cb11e20abc31 Parents: 57ba701 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Mon Apr 27 15:40:04 2015 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Mon Apr 27 15:40:30 2015 +0300 ---------------------------------------------------------------------- .../src/main/python/ambari_server/serverConfiguration.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/43e792cf/ambari-server/src/main/python/ambari_server/serverConfiguration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py index 26ee4b0..fec54e9 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -774,9 +774,14 @@ def update_ambari_properties(): # Previous config file does not exist if (not prev_conf_file) or (prev_conf_file is None): - print_warning_msg("Can not find ambari.properties.backup file from previous version, skipping import of settings") + print_warning_msg("Can not find %s file from previous version, skipping import of settings" % configDefaults.AMBARI_PROPERTIES_BACKUP_FILE) return 0 + # ambari.properties file does not exists + if conf_file is None: + print_error_msg("Can't find %s file" % AMBARI_PROPERTIES_FILE) + return -1 + try: old_properties = Properties() old_properties.load(open(prev_conf_file))
