almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Support loading groups from the kickstart template files.

Browse Source 
(cherry picked from commit c8d2045f89)
(cherry picked from commit fbda20b8b7)
This commit is contained in:
Chris Lumens 2018-07-12 17:15:11 -04:00 committed by Brian C. Lane
parent dbeb653942
commit 1de67f4f63
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pylorax/api/compose.py
View File

@ -74,8 +74,9 @@ def test_templates(dbo, share_dir):
ks = KickstartParser(ks_version, errorsAreFatal=False, missingIncludeIsFatal=False) ks = KickstartParser(ks_version, errorsAreFatal=False, missingIncludeIsFatal=False)
ks.readKickstartFromString(ks_template+"\n%end\n") ks.readKickstartFromString(ks_template+"\n%end\n")
pkgs = [(name, "*") for name in ks.handler.packages.packageList] pkgs = [(name, "*") for name in ks.handler.packages.packageList]
grps = [grp.name for grp in ks.handler.packages.groupList]
try: try:
_ = projects_depsolve(dbo, pkgs, []) _ = projects_depsolve(dbo, pkgs, grps)
except ProjectsError as e: except ProjectsError as e:
template_errors.append("Error depsolving %s: %s" % (compose_type, str(e))) template_errors.append("Error depsolving %s: %s" % (compose_type, str(e)))
@ -271,11 +272,11 @@ def start_build(cfg, dnflock, gitlock, branch, recipe_name, compose_type, test_m
ks_version = makeVersion() ks_version = makeVersion()
ks = KickstartParser(ks_version, errorsAreFatal=False, missingIncludeIsFatal=False) ks = KickstartParser(ks_version, errorsAreFatal=False, missingIncludeIsFatal=False)
ks.readKickstartFromString(ks_template+"\n%end\n") ks.readKickstartFromString(ks_template+"\n%end\n")
ks_projects = [(name, "*") for name in ks.handler.packages.packageList] pkgs = [(name, "*") for name in ks.handler.packages.packageList]
grps = [grp.name for grp in ks.handler.packages.groupList]
try: try:
with dnflock.lock: with dnflock.lock:
(template_size, _) = projects_depsolve_with_size(dnflock.dbo, ks_projects, [], (template_size, _) = projects_depsolve_with_size(dnflock.dbo, pkgs, grps, with_core=not ks.handler.packages.nocore)
with_core=not ks.handler.packages.nocore)
except ProjectsError as e: except ProjectsError as e:
log.error("start_build depsolve: %s", str(e)) log.error("start_build depsolve: %s", str(e))
raise RuntimeError("Problem depsolving %s: %s" % (recipe["name"], str(e))) raise RuntimeError("Problem depsolving %s: %s" % (recipe["name"], str(e)))