From 20a3fd2bed26dd6f43d8f5e09d89038e3ce9efb5 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 30 Oct 2008 19:50:52 +0000 Subject: 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 --- src/lib/Server/Plugins/Cfg.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/Server/Plugins/Cfg.py') 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) -- cgit v1.2.3-1-g7c22