[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit e9ce74390961554e7a7af4a6c7c90f7c1b389288
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Jan 29 16:15:10 2009 +0100

    odeviced: fix bug in realtimeclock. closes FSO #330

diff --git a/framework/subsystems/odeviced/kernel26.py b/framework/subsystems/odeviced/kernel26.py
index a0a6606..debb5fd 100644
--- a/framework/subsystems/odeviced/kernel26.py
+++ b/framework/subsystems/odeviced/kernel26.py
@@ -8,11 +8,17 @@ GPLv2 or later
 """
 
 MODULE_NAME = "odeviced.kernel26"
-__version__ = "0.9.9.5"
+__version__ = "0.9.9.6"
 
 from helpers import DBUS_INTERFACE_PREFIX, DBUS_PATH_PREFIX, readFromFile, writeToFile, cleanObjectName
 from framework.config import config
 from framework.patterns.kobject import KObjectDispatcher
+from framework.patterns.null import Null
+
+try:
+    import pyrtc
+except ImportError:
+    logger.error( "pyrtc not present. Can not operate real time clock" )
 
 import dbus.service
 
@@ -439,10 +445,6 @@ class RealTimeClock( dbus.service.Object ):
             return readFromFile( "%s/wakealarm" % self.node )
         else:
             # use ioctl interface
-            try:
-                import pyrtc
-            except ImportError:
-                logger.error( "pyrtc not present. Can not operate real time clock" )
             ( enabled, pending ), t = pyrtc.rtcReadAlarm()
             return "0" if not enabled else str( time.mktime( t ) )
 
@@ -453,26 +455,15 @@ class RealTimeClock( dbus.service.Object ):
             writeToFile( "%s/wakealarm" % self.node, t )
         else:
             # use ioctl interface
-            try:
-                import pyrtc
-            except ImportError:
-                logger.error( "pyrtc not present. Can not operate real time clock" )
-            if time == "0":
+            if t == "0":
                 pyrtc.rtcDisableAlarm()
             else:
-                pyrtc.rtcSetAlarm( time.gmtime( t ) )
+                pyrtc.rtcSetAlarm( time.gmtime( float(t) ) )
 
     @dbus.service.method( DBUS_INTERFACE, "", "" )
     def Suspend( self ):
         writeToFile( "/sys/power/state", "mem" )
 
-    # add poweroff?
-
-    @dbus.service.method( DBUS_INTERFACE, "", "s" )
-    def GetWakeupReason( self ):
-        # FIXME
-        return "unknown"
-
 #----------------------------------------------------------------------------#
 def factory( prefix, controller ):
 #----------------------------------------------------------------------------#

-- 
FSO frameworkd Debian packaging