From 5475ec0d44709ba862c104098a3f34878e8a75f4 Mon Sep 17 00:00:00 2001 From: Kioob Date: Thu, 1 Sep 2011 23:55:48 +0200 Subject: Cfg : do not strip() end of lines before applying .diff files --- src/lib/Server/Plugins/Cfg.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index fd716986c..65b8a51f7 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -47,7 +47,7 @@ def process_delta(data, delta): if not delta.specific.delta: return data if delta.specific.delta == 'cat': - datalines = data.split('\n') + datalines = data.strip().split('\n') for line in delta.data.split('\n'): if not line: continue @@ -160,7 +160,6 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): else: data = basefile.data for delta in used: - data = data.strip() data = process_delta(data, delta) if used: data += '\n' -- cgit v1.2.3-1-g7c22