[rhel7-branch 1/1] Skip setting up env and groups in software spoke for ks (#1263493)

bcl installerbot-noreply at redhat.com
Fri Sep 18 21:46:33 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

When using a kickstart with a %packages section the software spoke _apply
method should not setup the environment and groups. This has been
clobbering the package groupList, causing kickstart selected groups to
not be installed.

(cherry picked from commit 9740c401dd9f931131dbd2aff3971da9d718c353)

Resolves: rhbz#1263493
---
 pyanaconda/ui/gui/spokes/software.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
index 54fa8e7..317b4dc 100644
--- a/pyanaconda/ui/gui/spokes/software.py
+++ b/pyanaconda/ui/gui/spokes/software.py
@@ -162,20 +162,21 @@ def _apply(self):
         if not self.environment:
             return
 
-        addons = self._get_selected_addons()
-        for group in addons:
-            if group not in self.selectedGroups:
-                self.selectedGroups.append(group)
-
-        self._selectFlag = False
-        self.payload.data.packages.groupList = []
-        self.payload.selectEnvironment(self.environment)
-        for group in self.selectedGroups:
-            self.payload.selectGroup(group)
-
-        # And then save these values so we can check next time.
-        self._origAddons = addons
-        self._origEnvironment = self.environment
+        if not (flags.automatedInstall and self.data.packages.seen):
+            addons = self._get_selected_addons()
+            for group in addons:
+                if group not in self.selectedGroups:
+                    self.selectedGroups.append(group)
+
+            self._selectFlag = False
+            self.payload.data.packages.groupList = []
+            self.payload.selectEnvironment(self.environment)
+            for group in self.selectedGroups:
+                self.payload.selectGroup(group)
+
+            # And then save these values so we can check next time.
+            self._origAddons = addons
+            self._origEnvironment = self.environment
 
         hubQ.send_not_ready(self.__class__.__name__)
         hubQ.send_not_ready("SourceSpoke")


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/56b18673f85d5e6c08c03607f37301b3f845eca0


More information about the anaconda-patches mailing list