From 3ccff80e4dd266b391ab14f63cd8576633abf475 Mon Sep 17 00:00:00 2001 From: Matt Kemp Date: Fri, 15 Aug 2014 23:32:12 +0000 Subject: udiff doesn't mean unified diff, it means unicode diff --- src/lib/Bcfg2/Client/Tools/POSIX/File.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 5ccb0da22..baa1e0a90 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -190,9 +190,9 @@ class POSIXFile(POSIXTool): else: diff = self._diff(content, self._get_data(entry)[0], filename=entry.get("name")) - udiff = '\n'.join(l.rstrip('\n') for l in diff) if interactive: - if udiff: + if diff: + udiff = '\n'.join(l for l in diff) if hasattr(udiff, "decode"): udiff = udiff.decode(Bcfg2.Options.setup.encoding) try: @@ -207,8 +207,8 @@ class POSIXFile(POSIXTool): prompt.append("Diff took too long to compute, no " "printable diff") if not sensitive: - if udiff: - attrs["current_bdiff"] = b64encode(udiff) + if diff: + attrs["current_bdiff"] = b64encode("\n".join(diff)) else: attrs['current_bfile'] = b64encode(content) if interactive: -- cgit v1.2.3-1-g7c22