Skip to content

Commit 335b02f

Browse files
committed
Merge remote-tracking branch 'origin/pr/434'
* origin/pr/434: Skip updating disk size when qube is removed Pull request description: Fixes: QubesOS/qubes-issues#10285 For: QubesOS/qubes-issues#1512 --- I got to reproduce the issue: - qube manager -> default-dvm settings -> preload 4 disposables -> preload 0 disposables -> click on qube manager When clicking/focusing on qube manager, it triggers [QEvent.Type.WindowActivate](https://github.com/QubesOS/qubes-manager/blob/40fbf47c97df085b2a8315f728758606b1b6e3e9/qubesmanager/qube_manager.py#L927) which calls `VmManagerWindow.update_running_size()`. I logged `would fail` the line above the pass and got confirmation that it would fail there. I could not get it to fail in other places.
2 parents 40fbf47 + c2670f5 commit 335b02f

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

qubesmanager/qube_manager.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def update_power_state(self):
288288
self.state['outdated'] = 'eol'
289289
else:
290290
self.state['outdated'] = ""
291-
except (exc.QubesDaemonAccessError, exc.QubesVMNotFoundError):
291+
except exc.QubesDaemonAccessError:
292292
pass
293293

294294
def update(self, update_size_on_disk=False, event=None):
@@ -1188,9 +1188,12 @@ def check_updates(self, info=None):
11881188

11891189
def update_running_size(self, *_args):
11901190
for vm in self.qubes_app.domains:
1191-
if vm.is_running():
1192-
self.qubes_cache.get_vm(qid=vm.qid).update(
1193-
update_size_on_disk=True, event='disk_size')
1191+
try:
1192+
if vm.is_running():
1193+
self.qubes_cache.get_vm(qid=vm.qid).update(
1194+
update_size_on_disk=True, event='disk_size')
1195+
except exc.QubesVMNotFoundError:
1196+
pass # qube was destroyed in the meantime.
11941197

11951198
def on_domain_added(self, _submitter, _event, vm, **_kwargs):
11961199
try:

0 commit comments

Comments
 (0)