[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 2d4add763ec572e9e54ce032a455e31933a4c63d
Merge: d9a0e574e415ee5fce5f765725340868cad1f444 81baa47011a66ad2813f0e8b6e51996827761a00
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Wed Nov 12 16:31:20 2008 +0100

    Merge branch 'stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index bda6b69,f5e7447..776942f
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -296,7 -296,7 +296,7 @@@ class DeviceGetAntennaPower( DeviceMedi
  class DeviceSetAntennaPower( DeviceMediator ):
  #=========================================================================#
      def trigger( self ):
-         self._commchannel.enqueue( "+CPIN?", self.intermediateResponse, self.errorFromChannel )
+         self._commchannel.enqueue( "+CPIN?", self.intermediateResponse, self.errorFromChannel, timeout=const.TIMEOUT["SIMAUTH"] )
  
      def intermediateResponse( self, request, response ):
          if not response[-1] == "OK":
@@@ -315,7 -315,7 +315,7 @@@
          else:
              DeviceMediator.responseFromChannel( self, request, response )
  
-         self._commchannel.enqueue( "+CPIN?", self.intermediateResponse2, self.errorFromChannel )
+         self._commchannel.enqueue( "+CPIN?", self.intermediateResponse2, self.errorFromChannel, timeout=const.TIMEOUT["SIMAUTH"] )
  
      def intermediateResponse2( self, request, response ):
          if not response[-1] == "OK":
@@@ -762,14 -762,14 +762,14 @@@ class SimRetrieveMessagebook( SimMediat
                      index = int(header.groupdict()["index"])
                      status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
                      if "read" in status:
 -                      dir = "MT"
 +                      direction = "MT"
                      else:
 -                      dir = "MO"
 +                      direction = "MO"
                      length = int(header.groupdict()["pdulen"])
                  else:
                      # Now we decode the actual PDU
  
 -                    sms = ogsmd.gsm.sms.decodeSMS( line, dir)
 +                    sms = ogsmd.gsm.sms.decodeSMS( line, direction)
                      result.append( ( index, status, str(sms.oa), sms.ud, sms.featureMap ) )
              self._ok( result )
          else:
@@@ -793,13 -793,13 +793,13 @@@ class SimRetrieveMessage( SimMediator )
                      header = const.PAT_SMS_PDU_HEADER_SINGLE.match( self._rightHandSide(line) )
                      status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
                      if "read" in status:
 -                      dir = "MT"
 +                      direction = "MT"
                      else:
 -                      dir = "MO"
 +                      direction = "MO"
                      length = int(header.groupdict()["pdulen"])
                  else:
                      # Now we decode the actual PDU
 -                    sms = ogsmd.gsm.sms.decodeSMS( line, dir )
 +                    sms = ogsmd.gsm.sms.decodeSMS( line, direction )
                      result = ( status, str(sms.oa), sms.ud, sms.featureMap )
  
              self._ok( *result )

-- 
FSO frameworkd Debian packaging