shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-26 17:25:22 +03:00
Code Issues Projects Releases Wiki Activity

config: Move all the cliconfig data passing into vmmConfig

Browse Source 
Setting it in virt-manager is pretty redundant
This commit is contained in:
Cole Robinson 2013-10-02 14:53:41 -04:00
parent 7cb84f5ba5
commit 1294965aa3
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virt-manager
View File

@ -225,10 +225,8 @@ def main():
Gtk.get_minor_version(),
Gtk.get_micro_version())
config = virtManager.config.vmmConfig("virt-manager",
cliconfig.__version__,
os.path.join(cliconfig.asset_dir, "ui"),
options.testfirstrun)
config = virtManager.config.vmmConfig(
"virt-manager", cliconfig, options.testfirstrun)
if not util.local_libvirt_version() >= 6000:
# We need this version for threaded virConnect access
@ -236,15 +234,6 @@ def main():
_("virt-manager requires libvirt 0.6.0 or later."), "")
return
virtManager.config.running_config = config
config.default_qemu_user = cliconfig.default_qemu_user
config.rhel6_defaults = not cliconfig.rhel_enable_unsupported_opts
config.preferred_distros = cliconfig.preferred_distros
config.hv_packages = cliconfig.hv_packages
config.libvirt_packages = cliconfig.libvirt_packages
config.askpass_package = cliconfig.askpass_package
config.default_graphics_from_config = cliconfig.default_graphics
if options.usbredir and config.get_auto_redirection():
config.set_auto_redirection(False)

25
virtManager/config.py
View File

@ -145,11 +145,11 @@ class vmmConfig(object):
DEFAULT_VIRT_IMAGE_DIR = "/var/lib/libvirt/images"
DEFAULT_VIRT_SAVE_DIR = "/var/lib/libvirt"
def __init__(self, appname, appversion, ui_dir, test_first_run=False):
def __init__(self, appname, cliconfig, test_first_run=False):
self.appname = appname
self.appversion = appversion
self.appversion = cliconfig.__version__
self.conf_dir = "/org/virt-manager/%s/" % self.appname
self.ui_dir = ui_dir
self.ui_dir = os.path.join(cliconfig.asset_dir, "ui")
self.test_first_run = bool(test_first_run)
self.conf = SettingsWrapper("org.virt-manager.virt-manager")
@ -159,15 +159,13 @@ class vmmConfig(object):
# the keyring
self.keyring = None
self.default_qemu_user = "root"
# Use this key to disable certain features not supported on RHEL
self.rhel6_defaults = True
self.preferred_distros = []
self.hv_packages = []
self.libvirt_packages = []
self.askpass_package = []
self.default_graphics_from_config = "vnc"
self.default_qemu_user = cliconfig.default_qemu_user
self.rhel6_defaults = not cliconfig.rhel_enable_unsupported_opts
self.preferred_distros = cliconfig.preferred_distros
self.hv_packages = cliconfig.hv_packages
self.libvirt_packages = cliconfig.libvirt_packages
self.askpass_package = cliconfig.askpass_package
self.default_graphics_from_config = cliconfig.default_graphics
self.default_storage_format_from_config = "raw"
self._objects = []
@ -176,6 +174,9 @@ class vmmConfig(object):
self._spice_error = None
global running_config
running_config = self
def check_inspection(self):
try: