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

'templete' typo again

Browse Source
This commit is contained in:
Marek Marczykowski 2011-03-11 01:52:09 +01:00
parent 969b14b5ed
commit 3043a391e0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -644,7 +644,7 @@ class QubesTemplateVm(QubesVm):
@property @property
def type(self): def type(self):
return "TempleteVM" return "TemplateVM"
def set_updateable(self): def set_updateable(self):
if self.is_updateable(): if self.is_updateable():
@ -655,7 +655,7 @@ class QubesTemplateVm(QubesVm):
for appvm in self.appvms.values(): for appvm in self.appvms.values():
if appvm.is_updateable(): if appvm.is_updateable():
raise QubesException("One of the AppVMs ('{0}')is also 'updateable'\ raise QubesException("One of the AppVMs ('{0}')is also 'updateable'\
-- cannot make the TempleteVM {'{1}'} 'nonupdatable'".\ -- cannot make the TemplateVM {'{1}'} 'nonupdatable'".\
format (appvm.name, self.name)) format (appvm.name, self.name))
self.updateable = True self.updateable = True
@ -840,7 +840,6 @@ class QubesCowVm(QubesVm):
private_img = kwargs.pop("private_img") private_img = kwargs.pop("private_img")
template_vm = kwargs.pop("template_vm") template_vm = kwargs.pop("template_vm")
super(QubesCowVm, self).__init__(**kwargs) super(QubesCowVm, self).__init__(**kwargs)
qid = kwargs["qid"] qid = kwargs["qid"]
dir_path = kwargs["dir_path"] dir_path = kwargs["dir_path"]
@ -848,7 +847,7 @@ class QubesCowVm(QubesVm):
if not isinstance(self, QubesDom0NetVm): if not isinstance(self, QubesDom0NetVm):
assert template_vm is not None, "Missing template_vm for template based VM!" assert template_vm is not None, "Missing template_vm for template based VM!"
if not template_vm.is_template(): if not template_vm.is_template():
print "ERROR: template_qid={0} doesn't point to a valid TempleteVM".\ print "ERROR: template_qid={0} doesn't point to a valid TemplateVM".\
format(template_vm.qid) format(template_vm.qid)
return False return False
@ -1299,7 +1298,7 @@ class QubesDisposableVm(QubesVm):
assert template_vm is not None, "Missing template_vm for DisposableVM!" assert template_vm is not None, "Missing template_vm for DisposableVM!"
if not template_vm.is_template(): if not template_vm.is_template():
print "ERROR: template_qid={0} doesn't point to a valid TempleteVM".\ print "ERROR: template_qid={0} doesn't point to a valid TemplateVM".\
format(new_vm.template_vm.qid) format(new_vm.template_vm.qid)
return False return False
@ -1612,7 +1611,7 @@ class QubesVmCollection(dict):
return vm return vm
def set_default_template_vm(self, vm): def set_default_template_vm(self, vm):
assert vm.is_template(), "VM {0} is not a TempleteVM!".format(vm.name) assert vm.is_template(), "VM {0} is not a TemplateVM!".format(vm.name)
self.default_template_qid = vm.qid self.default_template_qid = vm.qid
def get_default_template_vm(self): def get_default_template_vm(self):