[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 bdea4c4ef1f0bf68db00c86bed751f52423f343b
Merge: 96fc9738e29f6d4ac34f2e351611dff70c3bc685 02c1d33689d3ada575a8beb45bd983c6b5c80021
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Mon Nov 10 20:31:34 2008 +0100

    Merge branch 'stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index 7355dd2,0ec2dcf..d513452
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -733,7 -733,7 +733,7 @@@ class SimGetMessagebookInfo( SimMediato
              afull, amax, bfull, bmax, cfull, cmax = safesplit( self._rightHandSide( response[0] ), ',' )
              result = {}
              # FIXME Can we safely ignore all but the first tuple always?
-             result.update( first=1, last=int(amax), used=afull )
+             result.update( first=1, last=int(amax), used=int(afull) )
              self._ok( result )
  
  #=========================================================================#
@@@ -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