ow.

keep a copy of whether metapkgs and optional components are selected by
default.  then use this information when writing out the anaconda-ks.cfg
so that we can write out something which is correct (#73195, #80838).

note that for metapkgs, we have to write out -pkg for each package in the
group because we have no syntax for unselecting groups and staying that
way seems saner

1 files changed, 5 insertions, 0 deletions

diff --git a/comps.py b/comps.py
index d5273a32a..ff8b3294e 100644
--- a/comps.py
+++ b/comps.py
@@ -343,6 +343,7 @@ class Component:
 
     def addMetaPkg(self, comp, isDefault = 0):
         self.metapkgs[comp] = (PKGTYPE_OPTIONAL, isDefault)
+        self.metadef[comp] = isDefault
 
     def addPackage(self, p, pkgtype, handleDeps = 1):
         if pkgtype == PKGTYPE_MANDATORY:
@@ -355,10 +356,12 @@ class Component:
             p.registerComponent(self)
             self.newpkgDict[p] = (PKGTYPE_OPTIONAL, 1)
             self.pkgDict[p] = None
+            self.optDict[p] = 1
             if handleDeps == 1:            
                 self.updateDependencyCountForAddition(p)            
         elif pkgtype == PKGTYPE_OPTIONAL:
             self.newpkgDict[p] = (PKGTYPE_OPTIONAL, 0)
+            self.optDict[p] = 2            
         else:
             log("Unable to add package %s to component %s because it has an unknown pkgtype of %d" %(p.name, self.name, pkgtype))
 
@@ -543,8 +546,10 @@ class Component:
 
         self.pkgDict = {}
         self.newpkgDict = {}
+        self.optDict = {}
         self.includes = []
         self.metapkgs = {}
+        self.metadef = {}
         self.manuallySelected = 0
         self.selectionCount = 0
         self.depsDict = {}