From 7dcb468f09781bacf79823748ef12bfbd1faeb21 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 5 Dec 2012 09:02:42 -0600 Subject: StructFile: get text from matching elements in XMLMatch --- src/lib/Bcfg2/Server/Plugin/helpers.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 318bf03f1..dfda30b39 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -641,6 +641,11 @@ class StructFile(XMLFileBacked): item.remove(child) item.getparent().append(child) self._xml_match(child, metadata) + if item.text: + if item.getparent().text is None: + item.getparent().text = item.text + else: + item.getparent().text += item.text item.getparent().remove(item) else: for child in item.iterchildren(): -- cgit v1.2.3-1-g7c22