diff -Nru aptdaemon-0.41+bzr614/debian/changelog aptdaemon-0.41+bzr614/debian/changelog --- aptdaemon-0.41+bzr614/debian/changelog 2011-04-05 17:14:05.000000000 +0200 +++ aptdaemon-0.41+bzr614/debian/changelog 2011-04-07 10:06:19.000000000 +0200 @@ -1,3 +1,10 @@ +aptdaemon (0.41+bzr614-0ubuntu2) natty; urgency=low + + * debian/patches/02_fix_unicode_in_convert_struct.patch: + - Decode non-unicode strings in _convert_struct (LP: #736507) + + -- Julian Andres Klode Thu, 07 Apr 2011 10:02:21 +0200 + aptdaemon (0.41+bzr614-0ubuntu1) natty; urgency=low * New bzr bugfix snapshot: diff -Nru aptdaemon-0.41+bzr614/debian/patches/02_fix_unicode_in_convert_struct.patch aptdaemon-0.41+bzr614/debian/patches/02_fix_unicode_in_convert_struct.patch --- aptdaemon-0.41+bzr614/debian/patches/02_fix_unicode_in_convert_struct.patch 1970-01-01 01:00:00.000000000 +0100 +++ aptdaemon-0.41+bzr614/debian/patches/02_fix_unicode_in_convert_struct.patch 2011-04-07 10:04:46.000000000 +0200 @@ -0,0 +1,18 @@ +Description: Decode non-unicode strings in _convert_struct (LP: #736507) +Author: Julian Andres Klode +Bug-Ubuntu: https://launchpad.net/bugs/736507 + +--- aptdaemon-0.41+bzr614.orig/aptdaemon/core.py ++++ aptdaemon-0.41+bzr614/aptdaemon/core.py +@@ -411,7 +411,10 @@ class Transaction(DBusObject): + elif signature[num] == "b": + struct.append(dbus.Boolean(item)) + elif signature[num] == "s": +- struct.append(dbus.String(item)) ++ try: ++ struct.append(dbus.String(item)) ++ except UnicodeDecodeError: ++ struct.append(dbus.String(item.decode("utf-8"))) + else: + raise Exception("Value %s with unknown signature %s" % \ + (item, signature[num])) diff -Nru aptdaemon-0.41+bzr614/debian/patches/series aptdaemon-0.41+bzr614/debian/patches/series --- aptdaemon-0.41+bzr614/debian/patches/series 2011-04-05 17:14:05.000000000 +0200 +++ aptdaemon-0.41+bzr614/debian/patches/series 2011-04-07 10:05:28.000000000 +0200 @@ -1 +1,2 @@ 01_relax_lintian_checks.patch +02_fix_unicode_in_convert_struct.patch