瀏覽代碼

AMBARI-15798. Ambari install failing in RHEL7 while trying to install ATS (aonishuk)

Andrew Onishuk 9 年之前
父節點
當前提交
d00fc4c6fa
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      ambari-common/src/main/python/resource_management/libraries/functions/format.py

+ 2 - 1
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
       # the environment parameters and add in any locally declared variables to
       # override existing env parameters
       # override existing env parameters
       all_params = params.copy()
       all_params = params.copy()
-      all_params.update(variables)
     else:
     else:
       all_params = {}
       all_params = {}
+      
+    all_params.update(variables)
 
 
     self.convert_field = self.convert_field_protected
     self.convert_field = self.convert_field_protected
     result_protected = self.vformat(format_string, args, all_params)
     result_protected = self.vformat(format_string, args, all_params)