diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 09:02:23 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 09:20:01 -0400 |
| commit | 122b009b390816b88d44f8c19d7a4b38ba5f4c3f (patch) | |
| tree | cdb9b6c744ea74c1d92a5e7f6fd0b6ba48510608 /src/lib/Bcfg2/Client/Tools | |
| parent | b64f655f54cb6d1f23712eef129341af4a25423c (diff) | |
| download | bcfg2-122b009b390816b88d44f8c19d7a4b38ba5f4c3f.tar.gz bcfg2-122b009b390816b88d44f8c19d7a4b38ba5f4c3f.tar.bz2 bcfg2-122b009b390816b88d44f8c19d7a4b38ba5f4c3f.zip | |
fixed diffs of unicode files
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 6013d864e..99d9133b4 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -169,7 +169,7 @@ class POSIXFile(POSIXTool): attrs['current_bfile'] = binascii.b2a_base64(content) else: if interactive: - diff = self._diff(content, entry.text, + diff = self._diff(content, self._get_data(entry)[0], difflib.unified_diff, filename=entry.get("name")) if diff: @@ -182,8 +182,8 @@ class POSIXFile(POSIXTool): prompt.append("Diff took too long to compute, no " "printable diff") if not sensitive: - diff = self._diff(content, entry.text, difflib.ndiff, - filename=entry.get("name")) + diff = self._diff(content, self._get_data(entry)[0], + difflib.ndiff, filename=entry.get("name")) if diff: attrs["current_bdiff"] = \ binascii.b2a_base64("\n".join(diff)) |