diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-01-20 15:48:00 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-01-20 15:48:00 +0000 |
| commit | 7e081f46b2ad92b01f68497cd763e7379778e566 (patch) | |
| tree | e7ed5ce5f37868b13db44b5f1dfaa0b66435ab0f | |
| parent | d7b153bc76c4c08eebc1cdda8a29d449ab148045 (diff) | |
| download | bcfg2-7e081f46b2ad92b01f68497cd763e7379778e566.tar.gz bcfg2-7e081f46b2ad92b01f68497cd763e7379778e566.tar.bz2 bcfg2-7e081f46b2ad92b01f68497cd763e7379778e566.zip | |
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
| -rw-r--r-- | src/lib/Client/Tools/POSIX.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |