From 7e081f46b2ad92b01f68497cd763e7379778e566 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sat, 20 Jan 2007 15:48:00 +0000 Subject: Fix unicode problem for diff display (Resolves Ticket #365) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2705 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/POSIX.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 85fd9fac3..e1e0a2265 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -206,7 +206,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): pass udiff = '\n'.join([x for x in difflib.unified_diff(content.split('\n'), \ tempdata.split('\n'))]) - entry.set('qtext', udiff + "\nInstall ConfigFile %s: (y/N) " % \ + entry.set('qtext', udiff.encode('ascii') + "\nInstall ConfigFile %s: (y/N) " % \ (entry.get('name'))) return contentStatus and permissionStatus -- cgit v1.2.3-1-g7c22