[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone5.1

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 345625aa72dc16dff0d8680c824ed06229acf0f0
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Feb 19 15:20:43 2009 +0100

    otapi: CbGetCellBroadcastSubscriptions: remove shadowing the error module

diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index beb9655..441a18a 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -1540,9 +1540,9 @@ class CbGetCellBroadcastSubscriptions( CbMediator ): # s
 #=========================================================================#
     def trigger( self ):
 
-        request, response, error = yield( "+CSCB?" )
-        if error is not None:
-            self.errorFromChannel( request, error )
+        request, response, err = yield( "+CSCB?" )
+        if err is not None:
+            self.errorFromChannel( request, err )
         else:
             if response[-1] != "OK":
                 self.responseFromChannel( request, response )
@@ -1564,7 +1564,7 @@ class CbGetCellBroadcastSubscriptions( CbMediator ): # s
                 else:
                     if channels == "": # drop nothing = accept 0-999
                         self._ok( "all" )
-                    self._error( error.InternalException, "+CSCB: 1 not yet handled" )
+                    self._error( error.InternalException( "+CSCB: 1 not yet handled" ) )
 
 #=========================================================================#
 class CbSetCellBroadcastSubscriptions( CbMediator ):

-- 
FSO frameworkd Debian packaging