Package: lfm
Version: 2.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Here's a patch I submited to Ubuntu that may help you too.


*** /tmp/tmp1SIIl8
In Ubuntu, the attached patch was applied to achieve the following:

This bug was fixed upstream in
https://bitbucket.org/inigoserna/lfm/changeset/8d2021770794



  * Fix a crash at startup, because of UnicodeDecodeError (LP: #786491)


Thanks for considering the patch.



-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty'), 
(100, 'natty-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-11-generic (SMP w/2 CPU cores)
Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== added file 'debian/patches/fix-lp786491.patch'
--- debian/patches/fix-lp786491.patch   1970-01-01 00:00:00 +0000
+++ debian/patches/fix-lp786491.patch   2011-10-03 05:18:24 +0000
@@ -0,0 +1,34 @@
+Description: Fix an UnicodeDecodeError by using decode() instead of str()
+Origin: upstream, https://bitbucket.org/inigoserna/lfm/changeset/8d2021770794
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lfm/+bug/786491
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617229
+Index: lfm-2.2/lfm/files.py
+===================================================================
+--- lfm-2.2.orig/lfm/files.py  2011-09-17 22:07:32.049362240 -0400
++++ lfm-2.2/lfm/files.py       2011-09-17 22:08:21.719435092 -0400
+@@ -152,11 +152,11 @@
+     try:
+         owner = pwd.getpwuid(st[stat.ST_UID])[0]
+     except:
+-        owner = str(st[stat.ST_UID])
++        owner = decode(st[stat.ST_UID])
+     try:
+         group = grp.getgrgid(st[stat.ST_GID])[0]
+     except:
+-        group = str(st[stat.ST_GID])
++        group = decode(st[stat.ST_GID])
+     return (typ, stat.S_IMODE(st[stat.ST_MODE]), owner, group,
+             size, st[stat.ST_MTIME])
+ 
+@@ -228,8 +228,8 @@
+     else:
+         mtime = time.strftime('%a  %d %b %Y', 
time.localtime(filevalues[FT_MTIME]))
+         mtime2 = time.strftime('%d %b  %Y', 
time.localtime(filevalues[FT_MTIME]))
+-    res['mtime'] = mtime
+-    res['mtime2'] = mtime2
++    res['mtime'] = decode(mtime)
++    res['mtime2'] = decode(mtime2)
+     return res
+ 
+ 

Reply via email to