Repository: ambari Updated Branches: refs/heads/trunk 88984efde -> d00fc4c6f
AMBARI-15798. Ambari install failing in RHEL7 while trying to install ATS (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d00fc4c6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d00fc4c6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d00fc4c6 Branch: refs/heads/trunk Commit: d00fc4c6fadb8e215e1b519f97b13e2ceae68e2a Parents: 88984ef Author: Andrew Onishuk <[email protected]> Authored: Mon Apr 11 12:05:44 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Apr 11 12:05:44 2016 +0300 ---------------------------------------------------------------------- .../main/python/resource_management/libraries/functions/format.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d00fc4c6/ambari-common/src/main/python/resource_management/libraries/functions/format.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/format.py b/ambari-common/src/main/python/resource_management/libraries/functions/format.py index 7126971..bf959a6 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/format.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/format.py @@ -50,9 +50,10 @@ class ConfigurationFormatter(Formatter): # the environment parameters and add in any locally declared variables to # override existing env parameters all_params = params.copy() - all_params.update(variables) else: all_params = {} + + all_params.update(variables) self.convert_field = self.convert_field_protected result_protected = self.vformat(format_string, args, all_params)
