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

Fixed missing import

Browse Source 
Fixed missing import in boot-from-cdrom tool.
fixes QubesOS/qubes-issues#3421
This commit is contained in:
Marta Marczykowska-Górecka 2018-01-08 20:00:55 +01:00
parent a84c5aba65
commit 839696f6f9
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesmanager/bootfromdevice.py
View File

@ -23,6 +23,7 @@ from . import utils
from . import ui_bootfromdevice # pylint: disable=no-name-in-module from . import ui_bootfromdevice # pylint: disable=no-name-in-module
from PyQt4 import QtGui, QtCore # pylint: disable=import-error from PyQt4 import QtGui, QtCore # pylint: disable=import-error
from qubesadmin import tools from qubesadmin import tools
from qubesadmin.tools import qvm_start
class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog): class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog):
@ -45,7 +46,6 @@ class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog):
# populate buttons and such # populate buttons and such
self.__init_buttons__() self.__init_buttons__()
def reject(self): def reject(self):
self.done(0) self.done(0)
@ -62,7 +62,7 @@ class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog):
self.tr("ERROR!"), self.tr("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
tools.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):
self.fileVM.setEnabled(False) self.fileVM.setEnabled(False)
@ -112,6 +112,7 @@ class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog):
parser = tools.QubesArgumentParser(vmname_nargs=1) parser = tools.QubesArgumentParser(vmname_nargs=1)
def main(args=None): def main(args=None):
args = parser.parse_args(args) args = parser.parse_args(args)
vm = args.domains.pop() vm = args.domains.pop()