From c9c81d8869cf2e9c245b827cd39241a2a8d17924 Mon Sep 17 00:00:00 2001 From: Kioob Date: Fri, 2 Sep 2011 01:08:09 +0200 Subject: Cfg : doesn't add a LineFeed after patching of files --- src/lib/Server/Plugins/Cfg.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 65b8a51f7..2c0c69926 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -56,7 +56,7 @@ def process_delta(data, delta): elif line[0] == '-': if line[1:] in datalines: datalines.remove(line[1:]) - return "\n".join(datalines) + return "\n".join(datalines) + "\n" elif delta.specific.delta == 'diff': basehandle, basename = tempfile.mkstemp() basefile = open(basename, 'w') @@ -161,8 +161,6 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): data = basefile.data for delta in used: data = process_delta(data, delta) - if used: - data += '\n' if entry.get('encoding') == 'base64': entry.text = binascii.b2a_base64(data) else: -- cgit v1.2.3-1-g7c22