svn commit: r1493184 - /incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/python/bootstrap.py

[sw...@apache.org]

Author: swagle
Date: Fri Jun 14 17:46:00 2013
New Revision: 1493184

URL: http://svn.apache.org/r1493184
Log:
AMBARI-2391. Bootstrap is broken for ambari web with RHEL-5.8. (Oleksandr Diachenko via swagle)

Modified:
    incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/python/bootstrap.py

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/python/bootstrap.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/python/bootstrap.py?rev=1493184&r1=1493183&r2=1493184&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/python/bootstrap.py (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/python/bootstrap.py Fri Jun 14 17:46:00 2013
@@ -251,7 +251,7 @@ pass    
     
 class BootStrap:
   TEMP_FOLDER = "/tmp"
-  OS_CHECK_SCRIPT_FILE_TEMPLATE = "os_type_check{0}.sh"
+  OS_CHECK_SCRIPT_FILE_TEMPLATE = "os_type_check%(f)s.sh"
 
   
   """ BootStrapping the agents on a list of hosts"""
@@ -277,7 +277,7 @@ class BootStrap:
     if fileNameTemplate == None:
       return self.getUtime()
     else:
-      return fileNameTemplate.format(self.getUtime())
+      return fileNameTemplate% {'f': self.getUtime()}
 
   # This method is needed  to implement the descriptor protocol (make object  to pass self reference to mockups)
   def __get__(self, obj, objtype):