summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKioob <ob.kioob@daevel.fr>2011-09-02 01:08:09 +0200
committerKioob <ob.kioob@daevel.fr>2011-09-02 01:08:09 +0200
commitc9c81d8869cf2e9c245b827cd39241a2a8d17924 (patch)
tree6099afbb27028870ff55dae6b23aba2bd39dcde0
parent5475ec0d44709ba862c104098a3f34878e8a75f4 (diff)
downloadbcfg2-c9c81d8869cf2e9c245b827cd39241a2a8d17924.tar.gz
bcfg2-c9c81d8869cf2e9c245b827cd39241a2a8d17924.tar.bz2
bcfg2-c9c81d8869cf2e9c245b827cd39241a2a8d17924.zip
Cfg : doesn't add a LineFeed after patching of files
-rw-r--r--src/lib/Server/Plugins/Cfg.py4
1 files changed, 1 insertions, 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: