Skip to content

Commit

Permalink
Better error handling for opening VM settings in Qube Manager
Browse files Browse the repository at this point in the history
No more silent errors - the user will get an error message.

fixes QubesOS/qubes-issues#5810
  • Loading branch information
marmarta committed May 26, 2020
1 parent b058db4 commit 683d75d
Showing 1 changed file with 37 additions and 31 deletions.
68 changes: 37 additions & 31 deletions qubesmanager/qube_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1042,43 +1042,51 @@ def action_killvm_triggered(self):
"ERROR: {1}").format(vm.name, ex))
return

# noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_settings_triggered')
def action_settings_triggered(self):
vm = self.get_selected_vm()
if vm:
def open_settings(self, vm, tab='basic'):
try:
with common_threads.busy_cursor():
settings_window = settings.VMSettingsWindow(
vm, self.qt_app, "basic")
vm, self.qt_app, tab)
settings_window.exec_()
except exc.QubesException as ex:
QtWidgets.QMessageBox.warning(
self,
self.tr("Qube settings unavailable"),
self.tr(
"Qube settings cannot be opened. The qube might have "
"been removed or unavailable due to policy settings."
"\nError: {}".format(str(ex))))
return

vm_deleted = False
vm_deleted = False

try:
# the VM might not exist after running Settings - it might
# have been cloned or removed
self.vms_in_table[vm.qid].update()
except exc.QubesException:
# TODO: this will be replaced by proper signal handling once
# settings are migrated to AdminAPI
vm_deleted = True

if vm_deleted:
for row in self.vms_in_table:
try:
self.vms_in_table[row].update()
except exc.QubesException:
pass
try:
# the VM might not exist after running Settings - it might
# have been cloned or removed
self.vms_in_table[vm.qid].update()
except exc.QubesException:
vm_deleted = True

if vm_deleted:
for row in self.vms_in_table:
try:
self.vms_in_table[row].update()
except exc.QubesException:
pass

# noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_settings_triggered')
def action_settings_triggered(self):
vm = self.get_selected_vm()
if vm:
self.open_settings(vm, "basic")

# noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_appmenus_triggered')
def action_appmenus_triggered(self):
vm = self.get_selected_vm()
if vm:
with common_threads.busy_cursor():
settings_window = settings.VMSettingsWindow(
vm, self.qt_app, "applications")
settings_window.exec_()
self.open_settings(vm, "applications")

# noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_updatevm_triggered')
Expand Down Expand Up @@ -1136,11 +1144,9 @@ def action_set_keyboard_layout_triggered(self):
# noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_editfwrules_triggered')
def action_editfwrules_triggered(self):
with common_threads.busy_cursor():
vm = self.get_selected_vm()
settings_window = settings.VMSettingsWindow(vm, self.qt_app,
"firewall")
settings_window.exec_()
vm = self.get_selected_vm()
if vm:
self.open_settings(vm, "firewall")

# noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_global_settings_triggered')
Expand Down

0 comments on commit 683d75d

Please sign in to comment.