From 407c42d8b3484bfbc022b511495e8f6132b3fd90 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 18 Jan 2011 14:06:11 +0100 Subject: [PATCH] review logging policies --- source/utils.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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() -- 2.43.0