diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-11 15:50:01 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-11 15:50:09 -0400 |
| commit | 2b9d8b5e93b91063db6d4b6cde613c2d172362e3 (patch) | |
| tree | 0f2291186118186e6c4f6f829add84c1a7fd5f5f | |
| parent | e2e8e3e906789a29f2847e68cc9aac9f79e5c613 (diff) | |
| download | bcfg2-2b9d8b5e93b91063db6d4b6cde613c2d172362e3.tar.gz bcfg2-2b9d8b5e93b91063db6d4b6cde613c2d172362e3.tar.bz2 bcfg2-2b9d8b5e93b91063db6d4b6cde613c2d172362e3.zip | |
POSIX: fixed join of interactive-mode diff to work regardless of newlines
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 2 |
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: |