Attachment 603353 Details for Bug 845079 – utf8 patch for rhel5 s-c-users

[patch] utf8 patch for rhel5 s-c-users

system-config-users-1.2.51-utf8.patch (text/plain), 1.36 KB, created by Jeff Bastian on 2012-08-09 21:27:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Bastian

Created: 2012-08-09 21:27:37 UTC

Size: 1.36 KB

patch

obsolete

>commit d3c23c656ea7a7b6b2b7532e859ca2cd0d497d18
>Author: Jeffrey Bastian <jbastian@redhat.com>
>Date:   Thu Aug 9 15:56:48 2012 -0500
>
>    handle invalid UTF-8 in passwd info gracefully
>    
>    fixed in Fedora 10 with
>    http://git.fedorahosted.org/cgit/system-config-users.git/commit/?id=dd674ae82931cd9f5b93e2fa550a4befa8da0184
>
>diff --git a/src/mainWindow.py b/src/mainWindow.py
>index 26d8366..b19d199 100755
>--- a/src/mainWindow.py
>+++ b/src/mainWindow.py
>@@ -455,7 +455,7 @@ class mainWindow:
>                 groupName = gidNumber
> 
>             #Convert the user fullName into unicode so pygtk2 doesn't truncate strings
>-            gecos = unicode (gecos, 'utf-8')
>+            gecos = unicode (gecos, encoding = 'utf-8', errors = 'replace')
> 
>             if self.preferences['FILTER'] == True:
>                 #display users with UIDs > 499
>diff --git a/src/userProperties.py b/src/userProperties.py
>index 5e960b8..e34083b 100644
>--- a/src/userProperties.py
>+++ b/src/userProperties.py
>@@ -174,7 +174,7 @@ class userProperties:
> 
>         fn = self.userEnt.get(libuser.GECOS)[0]
>         #Convert the user fullName into unicode so pygtk2 doesn't truncate strings
>-        fn = unicode (fn, 'utf-8')
>+        fn = unicode (fn, encoding = 'utf-8', errors = 'replace')
>         hd = self.userEnt.get(libuser.HOMEDIRECTORY)[0]
>         shell = self.userEnt.get(libuser.LOGINSHELL)[0]
>

Actions: View | Diff

Attachments on bug 845079: 603353