Fixed bug 3594

Incorrect targetVM display - dom0 was not included, and the code
erroneously assumed that not only it is included, but also it's always
the first in the dropdown. No more assumptions.

fixes QubesOS/qubes-issues#3594
This commit is contained in:
Marta Marczykowska-Górecka 2018-02-20 19:22:57 +01:00
parent 3967d92e54
commit dc0f8c0a9e
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B

View File

@ -101,8 +101,10 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard):
self.qubes_app,
None,
self.qubes_app.domains['dom0'],
(lambda vm: vm.klass != 'TemplateVM' and vm.is_running()),
allow_internal=False,
filter_function=(lambda vm:
vm.klass != 'TemplateVM'
and vm.is_running()
and not vm.features.get('internal', False)),
allow_default=False,
allow_none=False
)
@ -236,7 +238,7 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard):
None, self.tr("Wait!"),
self.tr("Enter backup target location first."))
return False
if self.appvm_combobox.currentIndex() == 0 \
if self.appvm_combobox.currentText() == "dom0" \
and not os.path.isdir(backup_location):
QtGui.QMessageBox.information(
None, self.tr("Wait!"),