Fixed issue#3113 - boot from cdrom

Fixes missing cast to string in boot from cdrom tool.

fixes QubesOS/qubes-issues#3113
This commit is contained in:
Marta Marczykowska-Górecka 2017-10-04 23:28:02 +02:00
parent 8e01b1488c
commit 75ddc62bed
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B

View File

@ -49,14 +49,13 @@ class VMBootFromDeviceWindow(Ui_BootDialog, QDialog):
if self.blockDeviceRadioButton.isChecked(): if self.blockDeviceRadioButton.isChecked():
cdrom_location = self.blockDeviceComboBox.currentText() cdrom_location = self.blockDeviceComboBox.currentText()
elif self.fileRadioButton.isChecked(): elif self.fileRadioButton.isChecked():
cdrom_location = self.vm_list[self.fileVM.currentIndex()] + ":" + self.pathText.text() cdrom_location = str(self.vm_list[self.fileVM.currentIndex()]) + ":" + self.pathText.text()
else: else:
QMessageBox.warning(None, QMessageBox.warning(None,
self.tr( self.tr(
"ERROR!"), "ERROR!"),
self.tr("No file or block device selected; please select one.")) self.tr("No file or block device selected; please select one."))
return return
qvm_start.main(['--cdrom', cdrom_location, self.vm.name]) qvm_start.main(['--cdrom', cdrom_location, self.vm.name])
def __init_buttons__(self): def __init_buttons__(self):