From 2b9d8b5e93b91063db6d4b6cde613c2d172362e3 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 11 Sep 2012 15:50:01 -0400 Subject: POSIX: fixed join of interactive-mode diff to work regardless of newlines --- src/lib/Bcfg2/Client/Tools/POSIX/File.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22