Don't pull @core and @base groups by default.
This commit is contained in:
parent
a9581e2056
commit
9776e3cd9d
|
@ -597,22 +597,25 @@ class Pungi(pypungi.PungiBase):
|
||||||
|
|
||||||
# First remove the excludes
|
# First remove the excludes
|
||||||
self.ayum.excludePackages()
|
self.ayum.excludePackages()
|
||||||
|
|
||||||
# Get the groups set for removal
|
# Get the groups set for removal
|
||||||
for group in self.ksparser.handler.packages.excludedGroupList:
|
for group in self.ksparser.handler.packages.excludedGroupList:
|
||||||
excludeGroups.append(str(group)[1:])
|
excludeGroups.append(str(group)[1:])
|
||||||
|
|
||||||
# Always add the core group
|
if "core" in [ i.groupid for i in self.ayum.comps.groups ]:
|
||||||
self.ksparser.handler.packages.add(['@core'])
|
if "core" not in [ i.name for i in self.ksparser.handler.packages.groupList ]:
|
||||||
|
self.logger.warning("The @core group is no longer added by default; Please add @core to the kickstart if you want it in.")
|
||||||
|
|
||||||
|
if "base" in [ i.groupid for i in self.ayum.comps.groups ]:
|
||||||
|
if "base" not in [ i.name for i in self.ksparser.handler.packages.groupList ]:
|
||||||
|
if self.ksparser.handler.packages.addBase:
|
||||||
|
self.logger.warning("The --nobase kickstart option is no longer supported; Please add @base to the kickstart if you want it in.")
|
||||||
|
|
||||||
# Check to see if we want all the defaults
|
# Check to see if we want all the defaults
|
||||||
if self.ksparser.handler.packages.default:
|
if self.ksparser.handler.packages.default:
|
||||||
for group in self._addDefaultGroups(excludeGroups):
|
for group in self._addDefaultGroups(excludeGroups):
|
||||||
self.ksparser.handler.packages.add(['@%s' % group])
|
self.ksparser.handler.packages.add(['@%s' % group])
|
||||||
|
|
||||||
# Check to see if we need the base group
|
|
||||||
if self.ksparser.handler.packages.addBase:
|
|
||||||
self.ksparser.handler.packages.add(['@base'])
|
|
||||||
|
|
||||||
# Get a list of packages from groups
|
# Get a list of packages from groups
|
||||||
for group in self.ksparser.handler.packages.groupList:
|
for group in self.ksparser.handler.packages.groupList:
|
||||||
|
|
Loading…
Reference in New Issue