r558 - trunk/v7
Author: gnichols
Date: 2010-06-16 21:49:56 +0000 (Wed, 16 Jun 2010)
New Revision: 558
Modified:
trunk/v7/daemon.py
Log:
568518 - FEAT: add a BMC fencing testing
Modified: trunk/v7/daemon.py
===================================================================
--- trunk/v7/daemon.py 2010-06-16 21:49:43 UTC (rev 557)
+++ trunk/v7/daemon.py 2010-06-16 21:49:56 UTC (rev 558)
@@ -106,7 +106,7 @@
logFileName = "v7-daemon-"
for (key, value) in args.items():
if key != "results":
- logFileName = logFileName + "%s=%s_"
+ logFileName = logFileName + "%s=%s_" % (key, value)
log = open(os.path.join(self.environment.getLogDirectory(), logFileName), mode)
return log
@@ -120,7 +120,7 @@
log = self.openLogFile(args, "r")
taskOutFile = open(self.environment.getTaskFilePath()+ ".out",
'w')
for line in log:
- taskOutFile.write(line + "\n")
+ taskOutFile.write(line)
taskOutFile.close()
log.close()
return True