remove breakpoints, and use log instead of print when possible

diff --git a/source/BootManager.py b/source/BootManager.py
index c1c2f85..2d9db0b 100755 (executable)
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -377,7 +377,7 @@ def main(argv):
     import utils
     utils.prompt_for_breakpoint_mode()
 
     import utils
     utils.prompt_for_breakpoint_mode()
 

-#    utils.breakpoint ("Entering BootManager::main")
+#    utils.breakpoint("Entering BootManager::main")

 
     # set to 1 if error occurred
     error = 0
 
     # set to 1 if error occurred
     error = 0

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index baba483..78337ab 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -312,7 +312,7 @@ def Run(vars, log):
         pass 
 
     utils.sysexec_noerr('hwclock --systohc --utc ', log)
         pass 
 
     utils.sysexec_noerr('hwclock --systohc --utc ', log)

-    utils.breakpoint ("Before kexec");
+#    utils.breakpoint("Before kexec");

     try:
         utils.sysexec('kexec --force --initrd=/tmp/initrd --append="{}" /tmp/kernel'.format(kargs), log)
     except BootManagerException as e:
     try:
         utils.sysexec('kexec --force --initrd=/tmp/initrd --append="{}" /tmp/kernel'.format(kargs), log)
     except BootManagerException as e:

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index 0ba815c..f6f2d03 100644 (file)
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -70,7 +70,7 @@ def Run(vars, log):
     try:
         utils.removefile("{}/boot/{}".format(SYSIMG_PATH, initrd))
     except:
     try:
         utils.removefile("{}/boot/{}".format(SYSIMG_PATH, initrd))
     except:

-        print("{}/boot/{} is already removed".format(SYSIMG_PATH, initrd))
+        log.write("{}/boot/{} is already removed\n".format(SYSIMG_PATH, initrd))

 
     # hack for CentOS 5.3
     bypassRaidIfNeeded(SYSIMG_PATH , log)
 
     # hack for CentOS 5.3
     bypassRaidIfNeeded(SYSIMG_PATH , log)