From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 18 Jan 2011 13:06:11 +0000 (+0100)
Subject: review logging policies
X-Git-Tag: bootmanager-5.0-16~3
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=407c42d8b3484bfbc022b511495e8f6132b3fd90

review logging policies
---

diff --git a/source/utils.py b/source/utils.py
index 4c911a3..3c6c225 100644
--- a/source/utils.py
+++ b/source/utils.py
@@ -139,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 " \
@@ -154,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()