From 122b009b390816b88d44f8c19d7a4b38ba5f4c3f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 20 Aug 2012 09:02:23 -0400 Subject: fixed diffs of unicode files --- src/lib/Bcfg2/Client/Tools/POSIX/File.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Client') 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)) -- cgit v1.2.3-1-g7c22