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

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 5202e7d02890bd48736929af83a569ce7b9193ce
Merge: f70161d1e34fe087dd942fb2b0a98f3183a2373a 8221db85397bdedc7357086c34233b565957d61c
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Oct 31 18:03:30 2008 +0100

    Merge commit 'origin/stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index f25f88e,c74f142..bb02d18
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -21,6 -21,8 +21,8 @@@ TODO
   * refactor parameter validation
  """
  
+ __version__ = "0.9.9.1"
+ 
  from ogsmd.gsm import error, const, convert
  from ogsmd.gsm.decor import logged
  from ogsmd.helpers import safesplit
@@@ -760,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:
@@@ -791,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 )
@@@ -914,7 -916,7 +916,7 @@@ class NetworkGetStatus( NetworkMediato
              else:
                  result["strength"] = const.signalQualityToPercentage( int(safesplit( self._rightHandSide( response[0] ), ',' )[0]) ) # +CSQ: 22,99
  
-         request, response, error = yield( "+CREG?;+COPS?" )
+         request, response, error = yield( "+CREG?;+COPS=3,0;+COPS?" )
          if error is not None:
              self.errorFromChannel( request, error )
          else:

-- 
FSO frameworkd Debian packaging