diff options
| author | Kioob <ob.kioob@daevel.fr> | 2011-09-01 23:55:48 +0200 |
|---|---|---|
| committer | Kioob <ob.kioob@daevel.fr> | 2011-09-01 23:55:48 +0200 |
| commit | 5475ec0d44709ba862c104098a3f34878e8a75f4 (patch) | |
| tree | 5df4a51628d1d16a6349d892371d214e1bd5ceb7 /src/lib | |
| parent | 2f899bc95d4ff13b3aced106e2ad6743436f9560 (diff) | |
| download | bcfg2-5475ec0d44709ba862c104098a3f34878e8a75f4.tar.gz bcfg2-5475ec0d44709ba862c104098a3f34878e8a75f4.tar.bz2 bcfg2-5475ec0d44709ba862c104098a3f34878e8a75f4.zip | |
Cfg : do not strip() end of lines before applying .diff files
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 3 |
1 files changed, 1 insertions, 2 deletions
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' |