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

dom0/qvm-core: ignore template_vm=None when loading qubes.xml

Browse Source 
This should result in more elegant error message in case of error in qubes.xml.
This commit is contained in:
Marek Marczykowski 2011-10-07 21:44:46 +02:00
parent 98827c7020
commit 05605f1394
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2156,8 +2156,8 @@ class QubesVmCollection(dict):
if template_vm is None:
print >> sys.stderr, "ERROR: VM '{0}' uses unkown template qid='{1}'!".\
format(kwargs["name"], kwargs["template_qid"])
kwargs["template_vm"] = template_vm
else:
kwargs["template_vm"] = template_vm
if "label" in kwargs:
if kwargs["label"] not in QubesVmLabels:
@ -2377,8 +2377,9 @@ class QubesVmCollection(dict):
if template_vm is None:
print >> sys.stderr, "ERROR: DisposableVM '{0}' uses unkown template qid='{1}'!".\
format(kwargs["name"], kwargs["template_qid"])
else:
kwargs["template_vm"] = template_vm
kwargs["template_vm"] = template_vm
kwargs["netvm_vm"] = self.get_default_netvm_vm()
if kwargs["label"] is not None: