From 658ab0be8a6bada78a242b48f90dacf051143983 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 14 Jul 2006 19:18:08 +0000 Subject: Fix diffing of binary files git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1948 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Toolset.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py index 3b408aa40..c14bf4792 100644 --- a/src/lib/Client/Toolset.py +++ b/src/lib/Client/Toolset.py @@ -379,7 +379,10 @@ class Toolset(object): contentStatus = content == tempdata if not contentStatus: diff = '\n'.join([x for x in difflib.unified_diff(content.split('\n'), tempdata.split('\n'))]) - entry.set("current_diff", xml.sax.saxutils.quoteattr(diff)) + try: + entry.set("current_diff", xml.sax.saxutils.quoteattr(diff)) + except: + pass return contentStatus and permissionStatus def InstallConfigFile(self, entry): -- cgit v1.2.3-1-g7c22