External/macadmin-scripts
1
0
Fork 0
mirror of https://github.com/grahampugh/macadmin-scripts.git synced 2025-12-17 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle nested dict elem within auxinfo

Browse Source 
- this is present in 091-33271 (10.13.2, build 17C2120)
This commit is contained in:
Timothy Sutton 2017-12-19 09:42:04 -05:00
parent 7de1ecab2b
commit 397469774f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
installinstallmacos.py
View File

@ -218,7 +218,15 @@ def parse_dist(filename):
auxinfo = auxinfos[0] auxinfo = auxinfos[0]
key = None key = None
value = None value = None
for node in auxinfo.childNodes: children = auxinfo.childNodes
# handle the possibility that keys from auxinfo may be nested
# within a 'dict' element
dict_nodes = [n for n in auxinfo.childNodes
if n.nodeType == n.ELEMENT_NODE and
n.tagName == 'dict']
if dict_nodes:
children = dict_nodes[0].childNodes
for node in children:
if node.nodeType == node.ELEMENT_NODE and node.tagName == 'key': if node.nodeType == node.ELEMENT_NODE and node.tagName == 'key':
key = node.firstChild.wholeText key = node.firstChild.wholeText
if node.nodeType == node.ELEMENT_NODE and node.tagName == 'string': if node.nodeType == node.ELEMENT_NODE and node.tagName == 'string':