summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-05 09:02:42 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-10 17:21:42 -0600
commit7dcb468f09781bacf79823748ef12bfbd1faeb21 (patch)
treeb6e398c6b28fd57c52e5dea84b3a3db0ecba4470 /src
parent6b1c52c10f7156fe220727d7614fd5eb5c4f3d25 (diff)
downloadbcfg2-7dcb468f09781bacf79823748ef12bfbd1faeb21.tar.gz
bcfg2-7dcb468f09781bacf79823748ef12bfbd1faeb21.tar.bz2
bcfg2-7dcb468f09781bacf79823748ef12bfbd1faeb21.zip
StructFile: get text from matching elements in XMLMatch
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugin/helpers.py5
1 files changed, 5 insertions, 0 deletions
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():