commit 52fc788df54d064a7ea892b0ba01d5f36a0b16b3
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Sun Oct 24 12:05:02 2010 -0400
Preserve comment elements for resource ref tags
luci/lib/ClusterConf/ModelBuilder.py | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/luci/lib/ClusterConf/ModelBuilder.py b/luci/lib/ClusterConf/ModelBuilder.py
index 7da9426..ad14308 100644
--- a/luci/lib/ClusterConf/ModelBuilder.py
+++ b/luci/lib/ClusterConf/ModelBuilder.py
@@ -257,7 +257,8 @@ class ModelBuilder:
self.events_ptr = new_object
else:
if parent_node.nodeType in (Node.COMMENT_NODE, Node.TEXT_NODE):
- return parent_node
+ if parent_node.data and not parent_node.data.isspace():
+ return parent_node
return None
pending_comments = []
@@ -269,9 +270,7 @@ class ModelBuilder:
pending_comments.append(result_object.data)
elif result_object.nodeType == Node.TEXT_NODE:
if type(new_object) is Event.Event:
- elem_txt = result_object.data
- if elem_txt is not None and not elem_txt.isspace():
- new_object.element_text = elem_txt
+ new_object.element_text = result_object.data
else:
result_object.comments = pending_comments
new_object.addChild(result_object)
@@ -382,6 +381,13 @@ class ModelBuilder:
# Must be a service
parent = self.resourcemanager_ptr
+ try:
+ rf.comments = entity.comments
+ rf.trailing_comments = entity.trailing_comments
+ rf.element_text = entity.element_text
+ except:
+ pass
+
parent.replaceChild(entity, rf)
return True
Show replies by date