[Python-apps-commits] r1975 - in packages/emesene/trunk/debian (2 files)

[pochu-guest at users.alioth.debian.org]

    Date: Monday, November 17, 2008 @ 22:50:47
  Author: pochu-guest
Revision: 1975

* debian/patches/from_upstream_fix_logger_exceptions.patch:
  - Fix Logger plugin exceptions. Patch backported from upstream r1506.
    Closes: #503939.

Added:
  packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch
Modified:
  packages/emesene/trunk/debian/changelog

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-11-14 21:13:16 UTC (rev 1974)
+++ packages/emesene/trunk/debian/changelog	2008-11-17 22:50:47 UTC (rev 1975)
@@ -1,10 +1,16 @@
 emesene (1.0.1-2) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:47:20 +0100
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/from_upstream_fix_logger_exceptions.patch:
+    - Fix Logger plugin exceptions. Patch backported from upstream r1506.
+      Closes: #503939.
 
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Mon, 17 Nov 2008 23:33:34 +0100
+
 emesene (1.0.1-1) unstable; urgency=low
 
   * debian/patches/from_upstream_fix_invalid_application_header.patch,

Added: packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch
===================================================================
--- packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch	                        (rev 0)
+++ packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch	2008-11-17 22:50:47 UTC (rev 1975)
@@ -0,0 +1,49 @@
+Index: plugins_base/Logger.py
+===================================================================
+--- plugins_base/Logger.py	(revisión: 1480)
++++ plugins_base/Logger.py	(copia de trabajo)
+@@ -137,7 +137,7 @@
+     def user_exists(self, account):
+         '''return the user id if the account exists -1 otherwise'''
+ 
+-        self.cursor.execute(Logger.USER_EXISTS, (account,))
++        self.cursor.execute(Logger.USER_EXISTS, (unicode(account),))
+ 
+         result = self.cursor.fetchall() 
+         if len(result) >= 1:
+@@ -152,7 +152,7 @@
+         user_id = self.user_exists(account)
+ 
+         if user_id == -1:
+-            self.cursor.execute(Logger.USER_ADD, (account,))
++            self.cursor.execute(Logger.USER_ADD, (unicode(account),))
+             self.connection.commit()
+             return self.cursor.lastrowid
+ 
+@@ -165,7 +165,7 @@
+         user_id = self.user_add(account)
+         event_id = self.event_add(name, stamp)
+         self.cursor.execute(Logger.USER_EVENT_ADD, (event_id, 
+-                             user_id, data))
++                             user_id, data.decode("utf8")))
+         self.connection.commit()
+         return self.cursor.lastrowid
+ 
+@@ -173,7 +173,7 @@
+         '''add an event with name "name", return the id'''
+         if stamp is None:
+             stamp = time.time()
+-        self.cursor.execute(Logger.EVENT_ADD, (stamp, name))
++        self.cursor.execute(Logger.EVENT_ADD, (stamp, unicode(name)))
+         self.connection.commit()
+         return self.cursor.lastrowid
+ 
+@@ -185,7 +185,7 @@
+         event_id = self.event_add(name, stamp)
+         user_id = self.user_add(account)
+         self.cursor.execute(Logger.CONVERSATION_EVENT_ADD, (event_id,
+-                                conversation_id, user_id, data))
++                                conversation_id, user_id, data.decode("utf8")))
+         self.connection.commit()
+         return self.cursor.lastrowid
+