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

Merge remote-tracking branch 'origin/pr/188'

Browse Source 
* origin/pr/188:
  Fixed silent fail in Boot from File window
This commit is contained in:
Marek Marczykowski-Górecki 2019-07-31 17:28:10 +02:00
commit 1a147121f0
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
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)