[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone3-274-gd9a0e57

[Julien 'Ainulindale' Cassignol]

The following commit has been merged in the master branch:
commit 142093eed0412ded0f009e7fcb2409bf1147db7f
Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date:   Mon Nov 10 00:10:27 2008 +0100

    Forgot I was using python. else if -> elif

diff --git a/framework/subsystems/odeviced/idlenotifier.py b/framework/subsystems/odeviced/idlenotifier.py
index ad82924..94be948 100644
--- a/framework/subsystems/odeviced/idlenotifier.py
+++ b/framework/subsystems/odeviced/idlenotifier.py
@@ -139,7 +139,7 @@ class IdleNotifier( dbus.service.Object ):
     def SetTimeout( self, state, timeout ):
         if not state in self.validStates:
             raise InvalidState( "valid states are: %s" % self.validStates )
-        else if timeout is not None:
+        elif timeout is not None:
             self.timeouts[state] = timeout
 
     @dbus.service.method( DBUS_INTERFACE, "s", "" )

-- 
FSO frameworkd Debian packaging