summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-20 09:56:08 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-20 09:56:08 -0400
commit6aa50a314e6b1bff63f3cd5061fed13748ffe845 (patch)
tree99b87eb4813b72d7bc28dc9a28dc8bc1c9095cf8 /src
parentd8bb09e1d099a24e2d2f6e8bd1858b04cfa74085 (diff)
downloadbcfg2-6aa50a314e6b1bff63f3cd5061fed13748ffe845.tar.gz
bcfg2-6aa50a314e6b1bff63f3cd5061fed13748ffe845.tar.bz2
bcfg2-6aa50a314e6b1bff63f3cd5061fed13748ffe845.zip
removed excess newlines from interactive prompt diffs
Diffstat (limited to 'src')
-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 99d9133b4..9c5697162 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -173,7 +173,7 @@ class POSIXFile(POSIXTool):
difflib.unified_diff,
filename=entry.get("name"))
if diff:
- udiff = '\n'.join(diff)
+ udiff = ''.join(diff)
try:
prompt.append(udiff.decode(self.setup['encoding']))
except UnicodeEncodeError: