still prettifying

[bootmanager.git] / source / BootManager.py

diff --git a/source/BootManager.py b/source/BootManager.py
index 2f4f74f..c1c2f85 100755 (executable)
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -6,6 +6,8 @@
 # Copyright (c) 2004-2006 The Trustees of Princeton University
 # All rights reserved.
 
+from __future__ import print_function
+
 import sys, os
 import traceback
 import string
@@ -87,14 +89,14 @@ class log:
         except Exception, e:
             self.LogEntry(str(e))
             return
-    
+
     def LogEntry(self, str, inc_newline = 1, display_screen = 1):
         now = time.strftime(log.format, time.localtime())
         if self.OutputFile:
             self.OutputFile.write(now + str)
         if display_screen:
             sys.stdout.write(now + str)
-            
+
         if inc_newline:
             if display_screen:
                 sys.stdout.write("\n")
@@ -106,11 +108,11 @@ class log:
 
     def write(self, str):
         """
-        make log behave like a writable file object (for traceback
-        prints)
+        make log behave like a writable file object
+        (for traceback prints)
         """
         self.LogEntry(str, 0, 1)
-    
+
     def print_stack(self):
         """
         dump current stack in log
@@ -126,7 +128,7 @@ class log:
             self.OutputFile.flush()
 
             self.LogEntry("Uploading logs to {}".format(self.VARS['UPLOAD_LOG_SCRIPT']))
-            
+
             self.OutputFile.close()
             self.OutputFile = None
 
@@ -139,7 +141,7 @@ class log:
                                        GetVars = None, PostVars = None,
                                        DoSSL = True, DoCertCheck = True,
                                        FormData = ["log=@" + self.OutputFilePath,
-                                                   "hostname=" + hostname, 
+                                                   "hostname=" + hostname,
                                                    "type=bm.log"])
             except:
                 # new pycurl
@@ -151,7 +153,7 @@ class log:
                                                    ("hostname",hostname),
                                                    ("type","bm.log")])
         if extra_file is not None:
-            # NOTE: for code-reuse, evoke the bash function 'upload_logs'; 
+            # NOTE: for code-reuse, evoke the bash function 'upload_logs';
             # by adding --login, bash reads .bash_profile before execution.
             # Also, never fail, since this is an optional feature.
             utils.sysexec_noerr("""bash --login -c "upload_logs {}" """.format(extra_file), self)
@@ -169,7 +171,7 @@ class BootManager:
                      'safeboot' : None,
                      'disabled' : None,
                      }
-    
+
     def __init__(self, log, forceState):
         # override machine's current state from the command line
         self.forceState = forceState
@@ -185,7 +187,7 @@ class BootManager:
             self.VARS = log.VARS
         else:
             return
-             
+
         # not sure what the current PATH is set to, replace it with what
         # we know will work with all the boot cds
         os.environ['PATH'] = string.join(BIN_PATH,":")
@@ -228,14 +230,14 @@ class BootManager:
             # then finally chain boots.
 
             # starting the fallback/debug ssh daemon for safety:
-            # if the node install somehow hangs, or if it simply takes ages, 
+            # if the node install somehow hangs, or if it simply takes ages,
             # we can still enter and investigate
             try:
                 StartDebug.Run(self.VARS, self.LOG, last_resort = False)
             except:
                 pass
 
-            InstallInit.Run(self.VARS, self.LOG)                    
+            InstallInit.Run(self.VARS, self.LOG)
             ret = ValidateNodeInstall.Run(self.VARS, self.LOG)
             if ret == 1:
 # Thierry - feb. 2013 turning off WriteModprobeConfig for now on lxc
@@ -261,7 +263,7 @@ class BootManager:
         def _reinstallRun(upgrade=False):
 
             # starting the fallback/debug ssh daemon for safety:
-            # if the node install somehow hangs, or if it simply takes ages, 
+            # if the node install somehow hangs, or if it simply takes ages,
             # we can still enter and investigate
             try:
                 StartDebug.Run(self.VARS, self.LOG, last_resort = False)
@@ -277,10 +279,10 @@ class BootManager:
                 raise BootManagerException, "Hardware requirements not met."
 
             # runinstaller
-            InstallInit.Run(self.VARS, self.LOG)                    
+            InstallInit.Run(self.VARS, self.LOG)
             if not upgrade:
-                InstallPartitionDisks.Run(self.VARS, self.LOG)            
-            InstallBootstrapFS.Run(self.VARS, self.LOG)            
+                InstallPartitionDisks.Run(self.VARS, self.LOG)
+            InstallBootstrapFS.Run(self.VARS, self.LOG)
             InstallWriteConfig.Run(self.VARS, self.LOG)
             InstallUninitHardware.Run(self.VARS, self.LOG)
             self.VARS['BOOT_STATE'] = 'boot'
@@ -290,7 +292,7 @@ class BootManager:
             AnsibleHook.Run(self.VARS, self.LOG)
             UpdateBootStateWithPLC.Run(self.VARS, self.LOG)
             _bootRun()
-            
+
         def _installRun():
             # implements the new install logic, which will first check
             # with the user whether it is ok to install on this
@@ -343,20 +345,20 @@ class BootManager:
 
         except KeyError as e:
             self.LOG.write("\n\nKeyError while running: {}\n".format(e))
-            self.LOG.print_stack ()
+            self.LOG.print_stack()
         except BootManagerException as e:
             self.LOG.write("\n\nException while running: {}\n".format(e))
-            self.LOG.print_stack ()
+            self.LOG.print_stack()
         except BootManagerAuthenticationException as e:
             self.LOG.write("\n\nFailed to Authenticate Node: {}\n".format(e))
-            self.LOG.print_stack ()
+            self.LOG.print_stack()
             # sets /tmp/CANCEL_BOOT flag
             StartDebug.Run(self.VARS, self.LOG)
             # Return immediately b/c any other calls to API will fail
             return success
         except:
             self.LOG.write("\n\nImplementation Error\n")
-            self.LOG.print_stack ()
+            self.LOG.print_stack()
 
         if not success:
             try:
@@ -369,18 +371,17 @@ class BootManager:
                 traceback.print_exc()
 
         return success
-            
-            
+
 def main(argv):
 
     import utils
     utils.prompt_for_breakpoint_mode()
 
 #    utils.breakpoint ("Entering BootManager::main")
-    
+
     # set to 1 if error occurred
     error = 0
-    
+
     # all output goes through this class so we can save it and post
     # the data back to PlanetLab central
     LOG = log(BM_NODE_LOG)
@@ -403,7 +404,7 @@ def main(argv):
     except:
         traceback.print_exc(file=LOG.OutputFile)
         traceback.print_exc()
-        
+
     if error:
         LOG.LogEntry("BootManager finished at: {}"\
                      .format(time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())))
@@ -432,7 +433,6 @@ def main(argv):
 
     return error
 
-    
 if __name__ == "__main__":
     error = main(sys.argv)
     sys.exit(error)