You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/01/22 21:30:50 UTC
ambari git commit: AMBARI-9280. Ambari upgrade 1.4.4->2.0.0 fails
(dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 373afaad7 -> 77ae28e84
AMBARI-9280. Ambari upgrade 1.4.4->2.0.0 fails (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77ae28e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77ae28e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77ae28e8
Branch: refs/heads/trunk
Commit: 77ae28e8410ae2141c5140f8b72cca9e5e7983c8
Parents: 373afaa
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Jan 22 22:30:07 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Jan 22 22:30:07 2015 +0200
----------------------------------------------------------------------
.../src/main/python/ambari_server/serverConfiguration.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/77ae28e8/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 44c30ce..5547e44 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -56,7 +56,10 @@ BOOTSTRAP_DIR_PROPERTY = "bootstrap.dir"
AMBARI_CONF_VAR = "AMBARI_CONF_DIR"
AMBARI_PROPERTIES_FILE = "ambari.properties"
-AMBARI_PROPERTIES_BACKUP_FILE = "ambari.properties.backup"
+if OSCheck.is_windows_family():
+ AMBARI_PROPERTIES_BACKUP_FILE = "ambari.properties.backup"
+else:
+ AMBARI_PROPERTIES_BACKUP_FILE = "ambari.properties.rpmsave"
GET_FQDN_SERVICE_URL = "server.fqdn.service.url"