[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 0be860bbc94f497a877555fbb4c9c95107634ef3
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Jan 16 01:34:53 2009 +0100

    ogpsd: don't try to shutdown a channel that doesn't exist

diff --git a/framework/subsystems/ogpsd/gpsdevice.py b/framework/subsystems/ogpsd/gpsdevice.py
index d4ff1f6..91962d5 100644
--- a/framework/subsystems/ogpsd/gpsdevice.py
+++ b/framework/subsystems/ogpsd/gpsdevice.py
@@ -70,13 +70,15 @@ class GPSDevice( resource.Resource ):
         logger.info( "disabling" )
         self.ConnectionStatusChanged( False )
         self.shutdownDevice()
-        self.channel.shutdownChannel()
+        if self.channel is not None:
+            self.channel.shutdownChannel()
         on_ok()
 
     def _suspend( self, on_ok, on_error ):
         logger.info( "suspending" )
         self.ConnectionStatusChanged( False )
         self.suspendDevice()
+            self.channel.shutdownChannel()
         self.channel.suspendChannel()
         on_ok()
 
@@ -84,6 +86,7 @@ class GPSDevice( resource.Resource ):
         logger.info("resuming")
         self.channel.resumeChannel()
         self.resumeDevice()
+            self.channel.shutdownChannel()
         self.ConnectionStatusChanged( True )
         on_ok()
 

-- 
FSO frameworkd Debian packaging