summaryrefslogtreecommitdiffstats
path: root/src/lib/Client/Toolset.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-07-14 19:18:08 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-07-14 19:18:08 +0000
commit658ab0be8a6bada78a242b48f90dacf051143983 (patch)
tree72beb35c3dd73f6adcc8aab814408a30bb6ffb30 /src/lib/Client/Toolset.py
parentb76f5e6b3f58ef87a62f3484f72aa72678f166e4 (diff)
downloadbcfg2-658ab0be8a6bada78a242b48f90dacf051143983.tar.gz
bcfg2-658ab0be8a6bada78a242b48f90dacf051143983.tar.bz2
bcfg2-658ab0be8a6bada78a242b48f90dacf051143983.zip
Fix diffing of binary files
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1948 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/Toolset.py')
-rw-r--r--src/lib/Client/Toolset.py5
1 files changed, 4 insertions, 1 deletions
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):