[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone3-274-gd9a0e57

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 96fc9738e29f6d4ac34f2e351611dff70c3bc685
Merge: 9840a30e2362bac195703b6878cb9c9311f35c0c 2428ff1029bdae825ea77a18d6e7effca9e3be8d
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Mon Nov 10 19:59:11 2008 +0100

    Merge branch 'stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index cb80718,37adf6e..7355dd2
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -381,7 -381,7 +381,7 @@@ class DeviceSetSimBuffersSms( DeviceMed
  class SimGetAuthStatus( SimMediator ):
  #=========================================================================#
      def trigger( self ):
-         self._commchannel.enqueue( "+CPIN?", self.responseFromChannel, self.errorFromChannel )
+         self._commchannel.enqueue( "+CPIN?", self.responseFromChannel, self.errorFromChannel, timeout=const.TIMEOUT["SIMAUTH"] )
  
      @logged
      def responseFromChannel( self, request, response ):
@@@ -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 )
@@@ -873,7 -873,7 +873,7 @@@ class SmsSendMessage( SmsMediator )
          sms.ud = self.contents
          sms.featureMap = self.featuremap
          pdu = sms.pdu()
-         self._commchannel.enqueue( '+CMGS=%i\r%s' % ( len(pdu)/2-1, pdu), self.responseFromChannel, self.errorFromChannel)
+         self._commchannel.enqueue( '+CMGS=%i\r%s' % ( len(pdu)/2-1, pdu), self.responseFromChannel, self.errorFromChannel, timeout=const.TIMEOUT["NETWORK"])
  
      def responseFromChannel( self, request, response ):
          if response[-1] != "OK":

-- 
FSO frameworkd Debian packaging