Changeset 478 for tbroadcast

Timestamp:

Nov 28, 2008, 12:42:04 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 2

Location:

tbroadcast/HEAD

Files:

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

tbroadcast/HEAD/Changelog

@@ +1 @@
+2008-11-28    <rybkin@lal.in2p3.fr> 2
+        
+        * python/executer.py: Introduce function getstatusoutput returning
+        (status, stdout) of executing cmd
+        * python/tbroadcast.py: Use the introduced getstatusoutput instead of
+        the function of the same name from the standard module commands so as
+        not to mix stdout and stderr when parsing commands output
+
 2007-03-22 Vincent Garonne <garonne@lal.in2p3.fr> 1
 

tbroadcast/HEAD/python/executer.py

@@ -209 +209 @@
           return 1, retVal['stdout'], retVal['stderr'], 1
     
+############################################################################      
+def getstatusoutput(cmd):
+    """Return (status, stdout) of executing cmd in a shell.
+    
+    A trailing line separator is removed from the output string. The exit status of the command is encoded in the format specified for wait(), when the exit status is zero (termination without errors), 0 is returned.
+    """
+    import os
+    p = os.popen(cmd, 'r')
+    out = p.read()
+    sts = p.close()
+    if sts is None: sts = 0
+    if out.endswith(os.linesep):
+        out = out[:out.rindex(os.linesep)]
+    return sts, out
+
 #################################################################################
 ###################################### EoF ######################################

tbroadcast/HEAD/python/tbroadcast.py

@@ -24 +24 @@
 from threadpool import  makeRequests
 from executer   import  exeCommand
+from executer   import  getstatusoutput
 
 class Scheduler:
@@ -71 +72 @@
     def get_current_project(self):
         cmd = 'cmt show projects | grep current'
-        status, output = commands.getstatusoutput (cmd)
+        status, output = getstatusoutput (cmd)
+#        status, output = commands.getstatusoutput (cmd)
         if status != 0:
             print output
@@ -98 +100 @@
         cmd = 'cmt -private show cycles'
         cycle_found = False
-        status, output = commands.getstatusoutput (cmd)
+        status, output = getstatusoutput (cmd)
+#        status, output = commands.getstatusoutput (cmd)
         if status != 0:
             print output
@@ -249 +252 @@
         else:    
             cmd = 'cat ' + file        
-        status, output = commands.getstatusoutput (cmd)
+        status, output = getstatusoutput (cmd)
+#        status, output = commands.getstatusoutput (cmd)
         if status != 0:
             print output
@@ -309 +313 @@
     def get_current_package(self):    
         cmd = 'cmt show macro package'
-        status, output = commands.getstatusoutput (cmd)
+        status, output = getstatusoutput (cmd)
+#        status, output = commands.getstatusoutput (cmd)
         if status != 0:
             print output
@@ -326 +331 @@
         #return os.getcwd ()
         cmd = 'cmt -use='+name+' run pwd'
-        status, output = commands.getstatusoutput (cmd)
+        status, output = getstatusoutput (cmd)
+#        status, output = commands.getstatusoutput (cmd)
         if status != 0:
             print output