Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0: use default values for values not present in qubes.xml

Browse Source 
Do not set them to None. This should improve compatibility with older versions of qubes.xml
This commit is contained in:
Marek Marczykowski 2011-10-01 02:56:26 +02:00
parent 56f3d7ba75
commit 600877b830
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom0/qvm-core/qubes.py
View File

@ -2145,9 +2145,11 @@ class QubesVmCollection(dict):
for attribute in common_attr_list: for attribute in common_attr_list:
kwargs[attribute] = element.get(attribute) kwargs[attribute] = element.get(attribute)
if kwargs[attribute] is None:
kwargs.pop(attribute)
kwargs["qid"] = int(kwargs["qid"]) kwargs["qid"] = int(kwargs["qid"])
if kwargs["updateable"] is not None: if "updateable" in kwargs:
kwargs["updateable"] = True if kwargs["updateable"] == "True" else False kwargs["updateable"] = True if kwargs["updateable"] == "True" else False
if "installed_by_rpm" in kwargs: if "installed_by_rpm" in kwargs:
@ -2168,7 +2170,7 @@ class QubesVmCollection(dict):
kwargs["template_vm"] = template_vm kwargs["template_vm"] = template_vm
if kwargs["label"] is not None: if "label" in kwargs:
if kwargs["label"] not in QubesVmLabels: if kwargs["label"] not in QubesVmLabels:
print "ERROR: incorrect label for VM '{0}'".format(kwargs["name"]) print "ERROR: incorrect label for VM '{0}'".format(kwargs["name"])
kwargs.pop ("label") kwargs.pop ("label")
@ -2192,7 +2194,7 @@ class QubesVmCollection(dict):
if "uses_default_kernelopts" in kwargs: if "uses_default_kernelopts" in kwargs:
kwargs["uses_default_kernelopts"] = False if kwargs["uses_default_kernelopts"] == "False" else True kwargs["uses_default_kernelopts"] = False if kwargs["uses_default_kernelopts"] == "False" else True
if "kernelopts" in kwargs and kwargs["kernelopts"] == "None" or kwargs["kernelopts"] is None: if "kernelopts" not in kwargs or kwargs["kernelopts"] == "None":
kwargs.pop("kernelopts") kwargs.pop("kernelopts")
kwargs["uses_default_kernelopts"] = True kwargs["uses_default_kernelopts"] = True