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

qubes/vm: fix parameters for some even handlers

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-05-21 03:52:21 +02:00 committed by Wojtek Porczyk
parent 2bb73ab0a1
commit 5e2b617c6f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/app.py
View File

@ -994,4 +994,4 @@ class Qubes(qubes.PropertyHolder):
if vm.provides_network and vm.property_is_default('netvm'): if vm.provides_network and vm.property_is_default('netvm'):
# fire property-del:netvm as it is responsible for resetting # fire property-del:netvm as it is responsible for resetting
# netvm to it's default value # netvm to it's default value
vm.fire_event('property-del:netvm', 'netvm', newvalue, oldvalue) vm.fire_event('property-del:netvm', 'netvm', oldvalue)

4
qubes/vm/mix/net.py
View File

@ -180,7 +180,7 @@ class NetVMMixin(qubes.events.Emitter):
@qubes.events.handler('domain-pre-shutdown') @qubes.events.handler('domain-pre-shutdown')
def shutdown_net(self, force=False): def shutdown_net(self, event, force=False):
connected_vms = [vm for vm in self.connected_vms if vm.is_running()] connected_vms = [vm for vm in self.connected_vms if vm.is_running()]
if connected_vms and not force: if connected_vms and not force:
raise qubes.exc.QubesVMError( raise qubes.exc.QubesVMError(
@ -272,7 +272,7 @@ class NetVMMixin(qubes.events.Emitter):
pass pass
@qubes.events.handler('property-del:netvm') @qubes.events.handler('property-del:netvm')
def on_property_del_netvm(self, event, name, old_netvm): def on_property_del_netvm(self, event, prop, old_netvm=None):
# pylint: disable=unused-argument # pylint: disable=unused-argument
# we are changing to default netvm # we are changing to default netvm
new_netvm = self.netvm new_netvm = self.netvm

2
qubes/vm/qubesvm.py
View File

@ -597,7 +597,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
self.autostart = self.autostart self.autostart = self.autostart
@qubes.events.handler('property-pre-set:autostart') @qubes.events.handler('property-pre-set:autostart')
def on_property_pre_set_autostart(self, event, prop, name, value, def on_property_pre_set_autostart(self, event, prop, value,
oldvalue=None): oldvalue=None):
# pylint: disable=unused-argument # pylint: disable=unused-argument
if subprocess.call(['sudo', 'systemctl', if subprocess.call(['sudo', 'systemctl',