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

qubes/vm: remove duplicated check for duplicate name on rename

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-09 03:02:04 +02:00
parent 73d61bb378
commit 5b4e30524a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubes/vm/qubesvm.py
View File

@ -523,9 +523,13 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
@qubes.events.handler('property-pre-set:name') @qubes.events.handler('property-pre-set:name')
def on_property_pre_set_name(self, event, name, newvalue, oldvalue=None): def on_property_pre_set_name(self, event, name, newvalue, oldvalue=None):
# pylint: disable=unused-argument # pylint: disable=unused-argument
if newvalue in [d.name for d in self.app.domains.values()]: try:
self.app.domains[newvalue]
except KeyError:
pass
else:
raise qubes.exc.QubesValueError( raise qubes.exc.QubesValueError(
"A domain with name %s already exists", newvalue) 'VM named {!r} already exists'.format(newvalue))
# TODO not self.is_stopped() would be more appropriate # TODO not self.is_stopped() would be more appropriate
if self.is_running(): if self.is_running():
@ -536,14 +540,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
subprocess.check_call(['sudo', 'systemctl', '-q', 'disable', subprocess.check_call(['sudo', 'systemctl', '-q', 'disable',
'qubes-vm@{}.service'.format(oldvalue)]) 'qubes-vm@{}.service'.format(oldvalue)])
try:
self.app.domains[newvalue]
except KeyError:
pass
else:
raise qubes.exc.QubesValueError(
'VM named {!r} already exists'.format(newvalue))
@qubes.events.handler('property-set:name') @qubes.events.handler('property-set:name')
def on_property_set_name(self, event, name, new_name, old_name=None): def on_property_set_name(self, event, name, new_name, old_name=None):
# pylint: disable=unused-argument # pylint: disable=unused-argument