From a331cc8dc2527f6eb8dcf895121d18773b8e76d9 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 29 Jan 2007 16:56:44 +0000 Subject: Fix traceback for binary files git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2724 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/POSIX.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index e1e0a2265..ce4bb7051 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -206,7 +206,11 @@ 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.encode('ascii') + "\nInstall ConfigFile %s: (y/N) " % \ + try: + eudiff = udiff.encode('ascii') + except: + eudiff = "No diff available" + entry.set('qtext', eudiff + "\nInstall ConfigFile %s: (y/N) " % \ (entry.get('name'))) return contentStatus and permissionStatus -- cgit v1.2.3-1-g7c22