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

Fixed silent fail in Boot from File window

Browse Source 
Now, when selecting a file fails for some reason
(lack of installed file manager, VM crashed on start,
anything), the user will get an error message.

references QubesOS/qubes-issues#5202
This commit is contained in:
Marta Marczykowska-Górecka 2019-07-29 19:13:23 +02:00
parent afa9ebd728
commit 349fb693be
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubesmanager/bootfromdevice.py
View File

@ -117,11 +117,26 @@ class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog):
def select_file_dialog(self): def select_file_dialog(self):
backend_vm = self.vm_list[self.fileVM.currentIndex()] backend_vm = self.vm_list[self.fileVM.currentIndex()]
error_occurred = False
try: try:
new_path = utils.get_path_from_vm(backend_vm, "qubes.SelectFile") new_path = utils.get_path_from_vm(backend_vm, "qubes.SelectFile")
except subprocess.CalledProcessError: except subprocess.CalledProcessError as ex:
if ex.returncode != 1:
# Error other than 'user did not select a file'
error_occurred = True
new_path = None new_path = None
except Exception: # pylint: disable=broad-except
error_occurred = True
new_path = None
if error_occurred:
QtGui.QMessageBox.warning(
None,
self.tr("Failed to display file selection dialog"),
self.tr("Check if the qube {0} can be started and has a file"
" manager installed.").format(backend_vm)
)
if new_path: if new_path:
self.pathText.setText(new_path) self.pathText.setText(new_path)