virtcli: Export config variables in a class object

Makes things easier to extend later

1 files changed, 5 insertions, 5 deletions

diff --git a/virt-manager b/virt-manager
index 8f7dd11d..9a26dd5b 100755
--- a/virt-manager
+++ b/virt-manager
@@ -32,7 +32,7 @@ from gi.repository import LibvirtGLib
 
 from virtinst import util as util
 from virtinst import cli as virtinstcli
-from virtcli import cliconfig
+from virtcli import CLIConfig
 
 # This is massively heavy handed, but I can't figure out any way to shut
 # up the slew of gtk deprecation warnings that clog up our very useful
@@ -89,7 +89,7 @@ def parse_commandline():
     parser = argparse.ArgumentParser(usage="virt-manager [options]",
                                      epilog=epilog)
     parser.add_argument('--version', action='version',
-                        version=cliconfig.__version__)
+                        version=CLIConfig.version)
     parser.set_defaults(uuid=None)
 
     # Trace every libvirt API call to debug output
@@ -150,7 +150,7 @@ def main():
     virtinstcli.setupLogging("virt-manager", options.debug, False, False)
 
     import virtManager
-    logging.debug("virt-manager version: %s", cliconfig.__version__)
+    logging.debug("virt-manager version: %s", CLIConfig.version)
     logging.debug("virtManager import: %s", str(virtManager))
 
     if options.tracelibvirt:
@@ -213,7 +213,7 @@ def main():
                   Gtk.get_micro_version())
 
     config = virtManager.config.vmmConfig(
-        "virt-manager", cliconfig, options.testfirstrun)
+        "virt-manager", CLIConfig, options.testfirstrun)
 
     if not util.local_libvirt_version() >= 6000:
         # We need this version for threaded virConnect access
@@ -227,7 +227,7 @@ def main():
 
     # Add our icon dir to icon theme
     icon_theme = Gtk.IconTheme.get_default()
-    icon_theme.prepend_search_path(cliconfig.icon_dir)
+    icon_theme.prepend_search_path(CLIConfig.icon_dir)
 
     from virtManager.engine import vmmEngine