Merge lp:~brunoqc/ubuntu/natty/lfm/lfm-fix-786491 into lp:ubuntu/natty/lfm

[Bruno Bigras]

Fix 786491 (this time with the actual patch)

[Daniel Holbach (dholbach)]

Good work, thanks! I took the liberty of running 'update-maintainer' (https://wiki.ubuntu.com/DebianMaintainerField) and uploaded it, so it should be sitting in the SRU review queue now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-24 16:55:24 +0000
+++ debian/changelog	2011-10-03 05:44:24 +0000
@@ -1,3 +1,9 @@
+lfm (2.2-1ubuntu0.11.04.1) natty-proposed; urgency=low
+
+  * Fix a crash at startup, because of UnicodeDecodeError (LP: #786491)
+
+ -- Bruno Bigras <[e-mail]>  Sat, 17 Sep 2011 22:19:56 -0400
+
 lfm (2.2-1) unstable; urgency=low
 
   * New Upstream release.
 
=== 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:44: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
+ 
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-05-24 16:55:24 +0000
+++ debian/patches/series	2011-10-03 05:44:24 +0000
@@ -1,2 +1,3 @@
 ignore_COPYING.patch
 debian-changes-2.2-1
+fix-lp786491.patch