Changeset 244 for tbroadcast/v2/python/executer.py

Timestamp:

Sep 7, 2006, 10:31:17 AM (18 years ago)

Author:

garonne

Message:

MàJ

File:

• tbroadcast/v2/python/executer.py (modified) (3 diffs)

tbroadcast/v2/python/executer.py

@@ -131 +131 @@
             return self.__generateSystemCommandError( "Exceeded maximum buffer size ( %d bytes ) timeout for '%s' call" % ( self.iBufferLimit, self.sCmd ) )
 
-    def systemCall( self, sCmd, oCallbackFunction = None ):
+    def systemCall( self, sCmd, oCallbackFunction = None, arg=None ):
         self.sCmd = sCmd
         self.oCallback = oCallbackFunction
+        self.arg    = arg
         self.oChild = popen2.Popen3( self.sCmd, True )
         self.lBuffers = [ [ "", 0 ], [ "", 0 ] ]
@@ -182 +183 @@
         iNextLine = self.lBuffers[ iIndex ][0][ self.lBuffers[ iIndex ][1]: ].find( "\n" )
         if iNextLine > -1:
-            self.oCallback( iIndex, self.lBuffers[ iIndex ][0][ self.lBuffers[ iIndex ][1]: self.lBuffers[ iIndex ][1] + iNextLine ] )
+            self.oCallback( iIndex, self.lBuffers[ iIndex ][0][ self.lBuffers[ iIndex ][1]: self.lBuffers[ iIndex ][1] + iNextLine ], arg=self.arg )
             self.lBuffers[ iIndex ][1] += iNextLine + 1 
             return True
@@ -196 +197 @@
 
 ############################################################################      
-def exeCommand( sCmd, iTimeout = 0, oLineCallback = redirectOutput):
+def exeCommand( sCmd, iTimeout = 0, oLineCallback = redirectOutput, arg=None):
     """Return ( status, output, error, pythonError ) of executing cmd in a shell."""
     oSPE = SubprocessExecuter( iTimeout )
-    retVal = oSPE.systemCall( sCmd, oLineCallback )
+    retVal = oSPE.systemCall( sCmd, oLineCallback, arg=arg)
     if retVal[ 'OK' ]:
         return retVal[ 'Value' ][0], retVal[ 'Value' ][1], retVal[ 'Value' ][2], 0