fix make sync for the current state of the test infra

[bootmanager.git] / source / utils.py

diff --git a/source/utils.py b/source/utils.py
index 58c8e48..3c6c225 100644 (file)
--- a/source/utils.py
+++ b/source/utils.py
@@ -17,20 +17,26 @@ import exceptions
 
 from Exceptions import *
 
+####################
+# the simplest way to debug is to let the node take off, 
+# ssh into it as root using the debug ssh key in /etc/planetlab
+# then go to /tmp/source 
+# edit this file locally to turn on breakpoints if needed, then run
+# ./BootManager.py
+####################
 
 ### handling breakpoints in the startup process
 import select, sys, string
 
-### global debug settings
-# NOTE. when BREAKPOINT_MODE turns out enabled,
-# you have to attend the boot phase, that would hang otherwise 
+### global debugging settings
 
 # enabling this will cause the node to ask for breakpoint-mode at startup
 # production code should read False/False
 PROMPT_MODE=False
 # default for when prompt is turned off, or it's on but the timeout triggers
 BREAKPOINT_MODE=False
-VERBOSE_MODE=False
+
+# verbose mode is just fine
 VERBOSE_MODE=True
 # in seconds : if no input, proceed
 PROMPT_TIMEOUT=5
@@ -133,12 +139,16 @@ def sysexec( cmd, log=None, fsck=False, shell=False ):
         # let the caller set 'shell' when that is desirable
         if shell or cmd.__contains__(">"):
             prog = subprocess.Popen(cmd, shell=True)
+            if log is not None:
+                log.write("sysexec (shell mode) >>> %s" % cmd)
             if VERBOSE_MODE:
-                print ("sysexec (shell mode) >>> %s" % cmd)
+                print "sysexec (shell mode) >>> %s" % cmd
         else:
             prog = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            if log is not None:
+                log.write("sysexec >>> %s\n" % cmd)
             if VERBOSE_MODE:
-                print ("sysexec >>> %s" % cmd)
+                print "sysexec >>> %s" % cmd
     except OSError:
         raise BootManagerException, \
               "Unable to create instance of subprocess.Popen " \
@@ -148,9 +158,12 @@ def sysexec( cmd, log=None, fsck=False, shell=False ):
     except KeyboardInterrupt:
         raise BootManagerException, "Interrupted by user"
 
+    # log stdout & stderr
     if log is not None:
-        if stdoutdata is not None:
-            log.write(stdoutdata)
+        if stdoutdata:
+            log.write("==========stdout\n"+stdoutdata)
+        if stderrdata:
+            log.write("==========stderr\n"+stderrdata)
 
     returncode = prog.wait()