diff options
| author | Matt Kemp <matt@mattikus.com> | 2014-08-15 23:32:12 +0000 |
|---|---|---|
| committer | Matt Kemp <matt@mattikus.com> | 2014-08-15 23:32:12 +0000 |
| commit | 3ccff80e4dd266b391ab14f63cd8576633abf475 (patch) | |
| tree | 58ecb3de8ac8b85d9f222b902fdb40a78b85d3c7 /src/lib/Bcfg2/Client/Tools/POSIX | |
| parent | 42378ac8aa5e3159054a99f2557301d489dc1e81 (diff) | |
| download | bcfg2-3ccff80e4dd266b391ab14f63cd8576633abf475.tar.gz bcfg2-3ccff80e4dd266b391ab14f63cd8576633abf475.tar.bz2 bcfg2-3ccff80e4dd266b391ab14f63cd8576633abf475.zip | |
udiff doesn't mean unified diff, it means unicode diff
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 8 |
1 files changed, 4 insertions, 4 deletions
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: |