From a2f0c1df9d43b785f16867a0ea4a173d01e879c1 Mon Sep 17 00:00:00 2001 From: Sebastien Robin Date: Tue, 14 Jun 2011 13:07:05 +0200 Subject: [PATCH] minor small fixes (undefined parameters and empty stderr file) --- slapos/recipe/erp5testnode/SlapOSControler.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/slapos/recipe/erp5testnode/SlapOSControler.py b/slapos/recipe/erp5testnode/SlapOSControler.py index 3b71a97..e9ed42f 100644 --- a/slapos/recipe/erp5testnode/SlapOSControler.py +++ b/slapos/recipe/erp5testnode/SlapOSControler.py @@ -69,7 +69,9 @@ class SlapOSControler(object): stderr.close() return status_dict - def runComputerPartition(self, config, process_group_pid_set=None): + def runComputerPartition(self, config, environment, + process_group_pid_set=None, + stdout=None, stderr=None): print "SlapOSControler.runSoftwareRelease" slap = slapos.slap.slap() slap.registerOpenOrder().request(self.software_profile, @@ -81,10 +83,12 @@ class SlapOSControler(object): close_fds=True, preexec_fn=os.setsid) process_group_pid_set.add(slapgrid.pid) slapgrid.wait() + stdout.seek(0) + stderr.seek(0) process_group_pid_set.remove(slapgrid.pid) status_dict = {'status_code':slapgrid.returncode, 'stdout':stdout.read(), 'stderr':stderr.read()} stdout.close() stderr.close() - return status_dict \ No newline at end of file + return status_dict -- 2.1.4