shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-11 05:17:59 +03:00
Code Issues Projects Releases Wiki Activity

xmlbuilder: Fix clearing address.domain element

Browse Source 
Our scheme for not unlinking a root node would cause issues if trying
to clear a @domain property when the root node was <domain>, even
if they are unrelated.
This commit is contained in:
Cole Robinson 2013-07-29 10:45:37 -04:00
parent 4f63458050
commit a23e30eb2d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virtinst/xmlbuilder.py
View File

@ -202,7 +202,7 @@ def _build_xpath_node(ctx, xpath, addnode=None):
return parentnode
def _remove_xpath_node(ctx, xpath, dofree=True, root_name=None):
def _remove_xpath_node(ctx, xpath, dofree=True, unlinkroot=True):
"""
Remove an XML node tree if it has no content
"""
@ -233,11 +233,11 @@ def _remove_xpath_node(ctx, xpath, dofree=True, root_name=None):
white.unlinkNode()
white.freeNode()
# Don't unlink the root node. This is usually a programming error,
# but the error usually cascades to a different spot and is hard
# to pin down. With this we usually get invalid XML which is
# easier to debug.
if root_name and node.name == root_name:
if not unlinkroot and node == ctx:
# Don't unlink the root node. This is usually a programming error,
# but the error usually cascades to a different spot and is hard
# to pin down. With this we usually get invalid XML which is
# easier to debug.
break
node.unlinkNode()
@ -552,8 +552,7 @@ class XMLProperty(property):
use_xpath = node.nodePath()
if val is None or val is False:
_remove_xpath_node(root_node, use_xpath,
root_name=root_node.name)
_remove_xpath_node(root_node, use_xpath, unlinkroot=False)
continue
if not node: