[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

Michael 'Mickey' Lauer mickey at vanille-media.de
Sat Aug 6 08:18:18 UTC 2011


The following commit has been merged in the debian branch:
commit ff1242d731be7dab19a1d6781200803993d42c5d
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Sep 3 19:44:43 2009 +0200

    ogsmd: ignore empty alphanumerical provider strings (happening for new providers)
    NOTE: Clients should use the SIM issuer instead, if registered to the home network.
    For this you have to call org.freesmartphone.GSM.SIM.GetSimIssuer() though, hence
    for layering purposes, we're not allowed to do it transparently in GetStatus().
    Fixes FSO #465

diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 573f2ab..b26e129 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -22,7 +22,7 @@ TODO:
  * refactor parameter validation
 """
 
-__version__ = "0.9.19.1"
+__version__ = "0.9.19.2"
 MODULE_NAME = "ogsmd.modems.abstract.mediator"
 
 from ogsmd import error as DBusError
@@ -1239,7 +1239,10 @@ class NetworkGetStatus( NetworkMediator ):
                 values = safesplit( self._rightHandSide( response[-3] ), ',' )
                 result["mode"] = const.REGISTER_MODE[int(values[0])]
                 if len( values ) > 2:
-                    result["provider"] = values[2].strip( '"' ).decode(charset)
+                    result["provider"] = values[2].strip( '" ' ).decode(charset)
+                    # remove empty provider
+                    if not result["provider"]:
+                        del result["provider"]
                     if len( values ) == 4:
                         result["act"] = const.REGISTER_ACT[int( values[3] )]
                     else: # AcT defaults to GSM

-- 
FSO frameworkd Debian packaging



More information about the pkg-fso-commits mailing list