[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone5-180-g5848db1

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit a42fcbeea600a57646c7d6948a38fb52a19f5fee
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 20:10:02 2009 +0100

    update 02_ascii-encode-in-gsm-channel.py.patch

diff --git a/debian/patches/02_ascii-encode-in-gsm-channel.py.patch b/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
index ff86e57..6fc7f09 100644
--- a/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
+++ b/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
@@ -1,11 +1,13 @@
---- fso-frameworkd.orig/framework/subsystems/ogsmd/gsm/channel.py
-+++ fso-frameworkd/framework/subsystems/ogsmd/gsm/channel.py
-@@ -338,7 +338,7 @@
-             return False
+Index: frameworkd/framework/subsystems/ogsmd/gsm/channel.py
+===================================================================
+--- frameworkd.orig/framework/subsystems/ogsmd/gsm/channel.py	2009-02-02 20:02:28.000000000 +0100
++++ frameworkd/framework/subsystems/ogsmd/gsm/channel.py	2009-02-02 20:09:38.000000000 +0100
+@@ -236,7 +236,7 @@
  
-         logger.debug( "%s: sending %d bytes: %s" % ( repr(self), len(self.q.peek()[0]), repr(self.q.peek()[0]) ) )
--        self.serial.write( self.q.peek()[0] ) # channel data
-+        self.serial.write( self.q.peek()[0].encode('ascii') ) # channel data
-         if self.q.peek()[3]: # channel timeout
-             self.watchTimeout = gobject.timeout_add_seconds( self.q.peek()[3], self._handleCommandTimeout )
-         return False
+     def _lowlevelWrite( self, data ):
+         """Called to write data to the port."""
+-        self.serial.write( data )
++        self.serial.write( data.encode('ascii') )
+ 
+     def _readyToSend( self, source, condition ):
+         """Called, if source is ready to receive data."""

-- 
FSO frameworkd Debian packaging