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

qubes/vm/dispvm: don't crash when DispVM is already killed

Browse Source 
This is regression of QubesOS/qubes-issues#1660

Fixes QubesOS/qubes-issues#1660
This commit is contained in:
Marek Marczykowski-Górecki 2016-11-04 13:25:09 +01:00
parent 6ff836dfa4
commit 3b209515c2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubes/vm/dispvm.py
View File

@ -162,7 +162,10 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
''' '''
app = qubes.Qubes(self.app.store) app = qubes.Qubes(self.app.store)
self = app.domains[self.uuid] self = app.domains[self.uuid]
self.force_shutdown() try:
self.force_shutdown()
except qubes.exc.QubesVMNotStartedError:
pass
self.remove_from_disk() self.remove_from_disk()
del app.domains[self] del app.domains[self]
app.save() app.save()