Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Protected loading manager settings from malformed config files

Browse Source 
Malformed config files will no longer prevent Qube Manager from
starting.
This commit is contained in:
Marta Marczykowska-Górecka 2019-04-30 16:29:50 +02:00
parent 0bb92311ba
commit f5586e770b
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubesmanager/qube_manager.py
View File

@ -466,7 +466,17 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.connect(self.action_toolbar, QtCore.SIGNAL("toggled(bool)"), self.connect(self.action_toolbar, QtCore.SIGNAL("toggled(bool)"),
self.showhide_toolbar) self.showhide_toolbar)
self.load_manager_settings() try:
self.load_manager_settings()
except Exception as ex: # pylint: disable=broad-except
QtGui.QMessageBox.warning(
None,
self.tr("Manager settings unreadable"),
self.tr("Qube Manager settings cannot be parsed. Previously "
"saved display settings may not be restored "
"correctly.\nError: {}".format(str(ex))))
self.settings_loaded = True
self.fill_table() self.fill_table()
@ -642,8 +652,6 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.resize(self.manager_settings.value("window_size", self.resize(self.manager_settings.value("window_size",
QtCore.QSize(1100, 600))) QtCore.QSize(1100, 600)))
self.settings_loaded = True
def get_vms_list(self): def get_vms_list(self):
return [vm for vm in self.qubes_app.domains] return [vm for vm in self.qubes_app.domains]
@ -1329,7 +1337,7 @@ def main():
asyncio.ensure_future(dispatcher.listen_for_events())) asyncio.ensure_future(dispatcher.listen_for_events()))
except asyncio.CancelledError: except asyncio.CancelledError:
pass pass
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
loop_shutdown() loop_shutdown()
exc_type, exc_value, exc_traceback = sys.exc_info()[:3] exc_type, exc_value, exc_traceback = sys.exc_info()[:3]
handle_exception(exc_type, exc_value, exc_traceback) handle_exception(exc_type, exc_value, exc_traceback)