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

Fix checking if there is AppVMs based on template (#154)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-04-05 14:33:51 +02:00
parent c2498a33e2
commit ffaa518c5a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1776,7 +1776,7 @@ class QubesVmCollection(dict):
def get_vms_based_on(self, template_qid): def get_vms_based_on(self, template_qid):
vms = set([vm for vm in self.values() vms = set([vm for vm in self.values()
if (vm.is_appvm() and vm.template_vm.qid == template_qid)]) if (vm.template_vm and vm.template_vm.qid == template_qid)])
return vms return vms
def get_vms_connected_to(self, netvm_qid): def get_vms_connected_to(self, netvm_qid):

2
dom0/qvm-tools/qvm-remove
View File

@ -48,7 +48,7 @@ def main():
print "The following AppVMs use '{0}' as a template:".format(vmname) print "The following AppVMs use '{0}' as a template:".format(vmname)
for vm in dependent_vms: for vm in dependent_vms:
print "{name:<12} (qid={qid})".format(qid=vm.qid, name=vm.name) print "{name:<12} (qid={qid})".format(qid=vm.qid, name=vm.name)
print "Please remove those VMs first, or use the --force option." print "Please remove those VMs first."
exit (1) exit (1)
if qvm_collection.default_template_qid == vm.qid: if qvm_collection.default_template_qid == vm.qid:
qvm_collection.default_template_qid = None qvm_collection.default_template_qid = None