[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 c0ae955a04972b6bad2a9cdcf5630e2ce4286eec
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Mon Sep 7 19:08:50 2009 +0200

    odeviced: kernel26: do not bail out, if we can't query the RTC

diff --git a/framework/subsystems/odeviced/kernel26.py b/framework/subsystems/odeviced/kernel26.py
index 1a3b01b..9a7a3ea 100644
--- a/framework/subsystems/odeviced/kernel26.py
+++ b/framework/subsystems/odeviced/kernel26.py
@@ -455,7 +455,11 @@ class RealtimeClock( dbus.service.Object ):
         """Return wakeup time in seconds since epoch (UTC) if a wakeup
         time has been set. Return 0, otherwise."""
         # the wakealarm attribute is not always present
-        ( enabled, pending ), t = pyrtc.rtcReadAlarm()
+        result = pyrtc.rtcReadAlarm()
+        if result is None:
+            logger.error( "Can't read RTC alarm. Returning 0" )
+            result = ( ( False, False ), 0 )
+        ( enabled, pending ), t = result
         return 0 if not enabled else calendar.timegm( t )
 
     @dbus.service.method( DBUS_INTERFACE, "i", "" )

-- 
FSO frameworkd Debian packaging