Changeset 573 for tbroadcast

Timestamp:

May 1, 2011, 6:40:34 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 6

Location:

tbroadcast/HEAD

Files:

• Changelog (modified) (1 diff)
• python/tbroadcast.py (modified) (6 diffs)

tbroadcast/HEAD/Changelog

@@ +1 @@
+2011-05-01    <rybkin@lal.in2p3.fr> 6
+
+        * python/tbroadcast.py: In class Scheduler, function get_uses, fix bug of
+        not adding use in last line of processed text ("cmt show uses" command
+        output) to dependencies
+
+2010-04-13 Emil Obreshkov <Emil.Obreshkov>
+        * python/tbroadcast.py - do not exit if "cmt show uses" return non-zero exit (in the new CMT v1r21)
+
 2009-08-11 Igor Kachaev <Igor.Katchaev@cern.ch>
         * python/threadpool.py update to version 1.2.5 (2008-11-19)

tbroadcast/HEAD/python/tbroadcast.py

@@ -68 +68 @@
         #status, output = commands.getstatusoutput (cmd)
         if status != 0:
+            print "WARNING: CMT exited with non-zero status!"
             print output
             sys.exit(-1)
@@ -95 +96 @@
         #status, output = commands.getstatusoutput (cmd)
         if status != 0:
+            print "WARNING: CMT exited with non-zero status!"
             print output
             sys.exit(-1)
@@ -207 +209 @@
         level_stack    = [{'name':previous_client,'level':previous_level},]
         ligne = lignes.pop()
-        while len(lignes)!=0:
-            current_level = string.find(ligne, 'use')
+        current_level = string.find(ligne, 'use')
+        while True:
+        #while len(lignes)!=0:
+            #current_level = string.find(ligne, 'use')
             while current_level > previous_level:
                 name    = string.split (ligne)[2]
@@ -225 +229 @@
                     #print ligne
                     current_level = string.find(ligne, 'use')
+                else: return
 
             # restore the level
-            if len(lignes):
-                if len(level_stack):
+            #if len(lignes):
+            if len(level_stack):
+                item = level_stack.pop()
+                while item['level'] >= current_level and len(level_stack):
                     item = level_stack.pop()
-                    while item['level'] >= current_level and len(level_stack):
-                             item = level_stack.pop()
-                    previous_client = item['name']
-                    previous_level  = item['level']
+                previous_client = item['name']
+                previous_level  = item['level']
+
+            if current_level <= previous_level: return
             #print previous_client, '-->',string.split (ligne)[2]
 
@@ -246 +253 @@
         #status, output = commands.getstatusoutput (cmd)
         if status != 0:
-            print output
-            sys.exit(-1)
+            print "WARNING: CMT exited with non-zero status!"
+            #sys.exit(-1)
         self.get_uses(output)
         self.get_paths(output)
@@ -296 +303 @@
         #status, output = commands.getstatusoutput (cmd)
         if status != 0:
+            print "WARNING: CMT exited with non-zero status!"
             print output
             sys.exit(-1)