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

[Michael 'Mickey' Lauer]

The following commit has been merged in the debian branch:
commit 1dd17f17629ef1a58f468a243d3bc84dab534c56
Author: Antonio Ospite <ospite at studenti.unina.it>
Date:   Fri May 21 14:13:53 2010 +0200

    ogsmd: move _freescale_neptune_modemOn to __new__
    
    By moving _freescale_neptune_modemOn() from __init__() to __new__() we
    can return None if the modem can't be initialized.
    
    Note that now _freescale_neptune_modemOn() is a static method.
    
    Signed-off-by: Antonio Ospite <ospite at studenti.unina.it>

diff --git a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
index 9d1ba8b..2a405fc 100644
--- a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
+++ b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
@@ -76,16 +76,20 @@ class FreescaleNeptune( AbstractModem ):
     """
 
     @logged
-    def __init__( self, *args, **kwargs ):
-        AbstractModem.__init__( self, *args, **kwargs )
-
+    def __new__( cls, *args, **kwargs ):
         global initDone
         if not initDone:
-            ret = self._freescale_neptune_modemOn()
-            if not ret:
-                return False
+            ret = cls._freescale_neptune_modemOn()
+            if ret == False:
+                return None
             initDone = True
 
+        return AbstractModem.__new__( cls, *args, **kwargs )
+
+    @logged
+    def __init__( self, *args, **kwargs ):
+        AbstractModem.__init__( self, *args, **kwargs )
+
         # /dev/mux0
         self._channels[ "CallAndNetwork" ] = CallAndNetworkChannel( self.pathfactory, "/dev/mux1", modem=self )
         # /dev/mux2
@@ -128,7 +132,8 @@ class FreescaleNeptune( AbstractModem ):
     def pathfactory(self, name):
         return name
 
-    def _freescale_neptune_modemOn(self):
+    @staticmethod
+    def _freescale_neptune_modemOn():
         global muxfds
         logger.debug("********************** Modem init **********************")
         subprocess.check_call(['modprobe', 'ohci-hcd'])

-- 
FSO frameworkd Debian packaging