[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 d9a0e574e415ee5fce5f765725340868cad1f444
Merge: bdea4c4ef1f0bf68db00c86bed751f52423f343b b4fc84fef759999e9e0cb73902e4b42fbbc8351d
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Mon Nov 10 22:00:44 2008 +0100

    Merge branch 'stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index d513452,94f6e96..bda6b69
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -283,7 -283,7 +283,7 @@@ class DeviceGetInfo( DeviceMediator )
  class DeviceGetAntennaPower( DeviceMediator ):
  #=========================================================================#
      def trigger( self ):
-         self._commchannel.enqueue( "+CFUN?", self.responseFromChannel, self.errorFromChannel )
+         self._commchannel.enqueue( "+CFUN?", self.responseFromChannel, self.errorFromChannel, timeout=const.TIMEOUT["CFUN"] )
  
      @logged
      def responseFromChannel( self, request, response ):
@@@ -306,7 -306,7 +306,7 @@@ class DeviceSetAntennaPower( DeviceMedi
              if pin_state != self._object.modem._simPinState:
                  self._object.AuthStatus( pin_state )
  
-         self._commchannel.enqueue( "+CFUN=%d" % self.power, self.responseFromChannel, self.errorFromChannel )
+         self._commchannel.enqueue( "+CFUN=%d" % self.power, self.responseFromChannel, self.errorFromChannel, timeout=const.TIMEOUT["CFUN"] )
  
      @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 )

-- 
FSO frameworkd Debian packaging