From f1d169ad7b317538a92943ee13b2740e0cab361f Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 7 Oct 2018 14:26:54 -0400
Subject: [PATCH] setup: Remove configure --{libvirt,kvm}-package-names

This was really only useful with packagekit integration, which
is now gone
---
 setup.py              | 12 ------------
 virt-manager.spec.in  | 12 ------------
 virtManager/config.py | 10 ----------
 virtcli/cliconfig.py  |  2 --
 4 files changed, 36 deletions(-)

diff --git a/setup.py b/setup.py
index ec0ccd08..810abe7d 100755
--- a/setup.py
+++ b/setup.py
@@ -313,12 +313,6 @@ class my_rpm(distutils.core.Command):
 class configure(distutils.core.Command):
     user_options = [
         ("prefix=", None, "installation prefix"),
-        ("libvirt-package-names=", None,
-         "list of libvirt distro packages virt-manager will check for on "
-         "first run. comma separated string (default=none)"),
-        ("kvm-package-names=", None,
-         "recommended kvm packages virt-manager will check for on first run "
-         "(default=none)"),
         ("askpass-package-names=", None,
          "name of your distro's askpass package(s) (default=none)"),
         ("default-graphics=", None,
@@ -335,8 +329,6 @@ class configure(distutils.core.Command):
 
     def initialize_options(self):
         self.prefix = sysprefix
-        self.libvirt_package_names = None
-        self.kvm_package_names = None
         self.askpass_package_names = None
         self.default_graphics = None
         self.default_hvs = None
@@ -346,10 +338,6 @@ class configure(distutils.core.Command):
         template = ""
         template += "[config]\n"
         template += "prefix = %s\n" % self.prefix
-        if self.libvirt_package_names is not None:
-            template += "libvirt_packages = %s\n" % self.libvirt_package_names
-        if self.kvm_package_names is not None:
-            template += "hv_packages = %s\n" % self.kvm_package_names
         if self.askpass_package_names is not None:
             template += "askpass_packages = %s\n" % self.askpass_package_names
         if self.default_graphics is not None:
diff --git a/virt-manager.spec.in b/virt-manager.spec.in
index ef9f1b23..40258152 100644
--- a/virt-manager.spec.in
+++ b/virt-manager.spec.in
@@ -7,8 +7,6 @@
 
 %global with_guestfs               0
 %global askpass_package            "openssh-askpass"
-%global libvirt_packages           "libvirt-daemon-kvm,libvirt-daemon-config-network"
-%global kvm_packages               ""
 %global default_hvs                "qemu,xen,lxc"
 
 
@@ -102,14 +100,6 @@ machine).
 
 
 %build
-%if %{kvm_packages}
-%global _kvm_packages --kvm-package-names=%{kvm_packages}
-%endif
-
-%if %{libvirt_packages}
-%global _libvirt_packages --libvirt-package-names=%{libvirt_packages}
-%endif
-
 %if %{askpass_package}
 %global _askpass_package --askpass-package-names=%{askpass_package}
 %endif
@@ -119,8 +109,6 @@ machine).
 %endif
 
 ./setup.py configure \
-    %{?_kvm_packages} \
-    %{?_libvirt_packages} \
     %{?_askpass_package} \
     %{?_default_hvs}
 
diff --git a/virtManager/config.py b/virtManager/config.py
index 24079774..c880b7c3 100644
--- a/virtManager/config.py
+++ b/virtManager/config.py
@@ -175,20 +175,10 @@ class vmmConfig(object):
         # the keyring
         self.keyring = None
 
-        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_hvs = CLIConfig.default_hvs
 
-        if self.test_first_run:
-            # Populate some package defaults to simplify git testing
-            if not self.libvirt_packages:
-                self.libvirt_packages = ["libvirt-daemon",
-                                         "libvirt-daemon-config-network"]
-            if not self.hv_packages:
-                self.hv_packages = ["qemu-kvm"]
-
         self.default_storage_format_from_config = "qcow2"
         self.default_console_resizeguest = 0
         self.default_add_spice_usbredir = "yes"
diff --git a/virtcli/cliconfig.py b/virtcli/cliconfig.py
index 15e1cfb6..c5f8c195 100644
--- a/virtcli/cliconfig.py
+++ b/virtcli/cliconfig.py
@@ -70,9 +70,7 @@ class _CLIConfig(object):
         self.cfgpath = _cfgpath
         self.version = __version__
 
-        self.hv_packages = _split_list(_get_param("hv_packages", ""))
         self.askpass_package = _split_list(_get_param("askpass_packages", ""))
-        self.libvirt_packages = _split_list(_get_param("libvirt_packages", ""))
         self.default_graphics = _get_param("default_graphics", "spice")
         self.default_hvs = _split_list(_get_param("default_hvs", ""))