summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/File.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
index 95a3e5ddf..99f0ed804 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -177,7 +177,7 @@ class POSIXFile(POSIXTool):
difflib.unified_diff,
filename=entry.get("name"))
if diff:
- udiff = ''.join(diff)
+ udiff = '\n'.join(l.rstrip('\n') for l in diff)
if hasattr(udiff, "decode"):
udiff = udiff.decode(self.setup['encoding'])
try: