Changeset 239 for tbroadcast

Timestamp:

Aug 26, 2006, 5:03:33 PM (18 years ago)

Author:

garonne

Message:

bug fixed

File:

• tbroadcast/v2/python/tbroadcast.py (modified) (6 diffs)

tbroadcast/v2/python/tbroadcast.py

@@ -12 +12 @@
 import random
 import commands
+import traceback
 
 from threadpool import WorkRequest
@@ -38 +39 @@
         lines = string.split(output, '\n')
         for line in lines:            
-            if line [0] != '#':            
+            if line!='' and line [0] != '#':            
                 if not cycle_found:
                     cycle_found = True
@@ -178 +179 @@
 
     def suppress_work_unit (self, name):
-        print '# remove', name, 'from schedule' 
+        #print '# remove', name, 'from schedule' 
         for key in self.packages.keys():
             if name in self.packages[key]['dependencies']:
@@ -204 +205 @@
         self.execute (command)
         self.wait()
-        while self.is_work_units(): 
-            self.wait()   
+        ##while self.is_work_units(): 
         
     def wait (self):
@@ -213 +213 @@
     def result_callback(self, request, result):
       #print "**Result: %s from request #%s" % (str(result), request.requestID)
-      print "# Result: %s from request #%s" % (result['package'], request.requestID)
+      #print "# Result: %s from request #%s" % (result['package'], request.requestID)
       self.execute (result['cmd'])
 
     # the work the threads will have to do 
     def do_execute(self, arg):
-        path = self.get_work_area_path (arg['package'])
+        path = self.get_work_area_path (arg['package'])   
+        self.set_work_unit_status (arg['package'], 'running')      
+        cmd = "cmt -use="+ arg['package'] + " run '"+ arg['cmd'] + "'"
+        os.chdir(path)        
         print '#--------------------------------------------------------------'
         print '# Now trying ['+ arg['cmd']+'] in ' + path
         print '#--------------------------------------------------------------'
-        self.set_work_unit_status (arg['package'], 'running')      
-        cmd = "cmt -use="+ arg['package'] + " run '"+ arg['cmd'] + "'"
-        os.chdir(path)
         cmd = arg['cmd']
         status, output, error, pythonError  = exeCommand(cmd,  iTimeout = 10)      
@@ -234 +234 @@
         #   raise RuntimeError(output)
         return {'output':output, 'cmd': arg['cmd'], 'package':arg['package']}
-                
+              
     # this will be called when an exception occurs within a thread
     def handle_exception(self, request, exc_info):
+        #traceback.print_stack()
         print "# Exception occured in request #%s: %s" % \
           (request.requestID, exc_info[1])