cleanup of breakpoints - no functional change

diff --git a/source/BootManager.py b/source/BootManager.py
index b745eb0..8d4c979 100755 (executable)
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -300,7 +300,7 @@ def main(argv):
     import utils
     utils.prompt_for_breakpoint_mode()
 
-    utils.breakpoint ("Entering BootManager::main")
+    #utils.breakpoint ("Entering BootManager::main")
     
     global NodeRunStates
     NodeRunStates = {'new':None,

diff --git a/source/steps/InstallBootstrapRPM.py b/source/steps/InstallBootstrapRPM.py
index b4d5e8f..cc7ed60 100644 (file)
--- a/source/steps/InstallBootstrapRPM.py
+++ b/source/steps/InstallBootstrapRPM.py
@@ -92,7 +92,7 @@ def Run( vars, log ):
 
     # check which nodegroups we are part of (>=4.0)
     extensions = [ "__main__" ]
-    utils.breakpoint("querying nodegroups")
+    utils.breakpoint("querying nodegroups for loading extensions")
     try:
 #        for (k,v) in vars.iteritems():
 #            print "vars['%s']='%s'"%(k,v)
@@ -104,7 +104,6 @@ def Run( vars, log ):
 
     except:
         log.write("WARNING : Failed to query nodegroups - installing only core software\n")
-        utils.breakpoint('query failure')
         pass
 
     # download and extract support tarball for this step, which has
@@ -184,7 +183,6 @@ def Run( vars, log ):
         url="PlanetLabConf/yum.conf.php"
         dest="%s/etc/yum.conf"%SYSIMG_PATH
         log.write("downloading bootstrap yum.conf\n")
-        utils.breakpoint ("before getting yum.conf")
         yumconf=bs_request.DownloadFile (url,getDict,None,
                                          1, 1, dest)
         if not yumconf:
@@ -205,5 +203,6 @@ def Run( vars, log ):
             # xxx how to check that this completed correctly ?
         # let's cleanup
         utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log )
+        utils.breakpoint ("Done with yum extensions")
 
     return 1

diff --git a/source/steps/InstallWriteConfig.py b/source/steps/InstallWriteConfig.py
index 2d19d47..60a53c3 100644 (file)
--- a/source/steps/InstallWriteConfig.py
+++ b/source/steps/InstallWriteConfig.py
@@ -86,7 +86,6 @@ def Run( vars, log ):
         log.write( "Unable to create directory\n" )
         return 0
 
-    utils.breakpoint("Before fstab");
     log.write( "Writing system /etc/fstab\n" )
     fstab= file( "%s/etc/fstab" % SYSIMG_PATH, "w" )
     fstab.write( "%s           none        swap      sw        0 0\n" % \
@@ -102,8 +101,6 @@ def Run( vars, log ):
     # fstab.write( "none         /rcfs       rcfs      defaults  0 0\n" )
     fstab.close()
 
-    utils.breakpoint("after fstab");
-
     log.write( "Writing system /etc/issue\n" )
     issue= file( "%s/etc/issue" % SYSIMG_PATH, "w" )
     issue.write( "PlanetLab Node: \\n\n" )