shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-23 17:34:21 +03:00
Code Issues Projects Releases Wiki Activity

xmlbuilder: Remove unneeded argument to _remove_xpath_node

Browse Source
This commit is contained in:
Cole Robinson 2014-01-25 14:48:27 -05:00
parent 5edf4de058
commit 16c8c31cbd
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virtinst/xmlbuilder.py
View File

@ -195,7 +195,7 @@ def _build_xpath_node(ctx, xpath, addnode=None):
return parentnode
def _remove_xpath_node(ctx, xpath, dofree=True, unlinkroot=True):
def _remove_xpath_node(ctx, xpath, dofree=True):
"""
Remove an XML node tree if it has no content
"""
@ -227,11 +227,9 @@ def _remove_xpath_node(ctx, xpath, dofree=True, unlinkroot=True):
white.unlinkNode()
white.freeNode()
if not unlinkroot and node == root_node:
# 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 node == root_node:
# Don't unlink the root node, since it's spread out to all
# child objects and it ends up wreaking havoc.
break
node.unlinkNode()
@ -642,7 +640,7 @@ class XMLProperty(property):
for node, val, use_xpath in node_map:
if val is None or val is False:
_remove_xpath_node(ctx, use_xpath, unlinkroot=False)
_remove_xpath_node(ctx, use_xpath)
continue
if not node: