diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2008-10-30 19:50:52 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2008-10-30 19:50:52 +0000 |
| commit | 20a3fd2bed26dd6f43d8f5e09d89038e3ce9efb5 (patch) | |
| tree | fda4ec61286d532de85ef4d9ad2c3f31b940808e | |
| parent | f03b9ddfaf67766ccfb493eb31e204b5ec87ecbc (diff) | |
| download | bcfg2-20a3fd2bed26dd6f43d8f5e09d89038e3ce9efb5.tar.gz bcfg2-20a3fd2bed26dd6f43d8f5e09d89038e3ce9efb5.tar.bz2 bcfg2-20a3fd2bed26dd6f43d8f5e09d89038e3ce9efb5.zip | |
Fix interspersed newlines in deltas with .cat files
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4956 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index fee4eb8db..6d53eefd1 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -75,6 +75,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): basefile = used.pop(0) data = basefile.data for delta in used: + data = data.strip() data = process_delta(data, delta) if entry.get('encoding') == 'base64': entry.text = binascii.b2a_base64(data) |