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

Support loading groups from the kickstart template files.

Browse Source
This commit is contained in:
Chris Lumens 2018-07-12 17:15:11 -04:00
parent ab0655d5a9
commit c8d2045f89
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,9 @@ def test_templates(yb, 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(yb, pkgs) _ = projects_depsolve(yb, 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)))
@ -278,9 +279,10 @@ def start_build(cfg, yumlock, gitlock, branch, recipe_name, compose_type, test_m
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:
with yumlock.lock: with yumlock.lock:
(template_size, _) = projects_depsolve_with_size(yumlock.yb, pkgs, [], (template_size, _) = projects_depsolve_with_size(yumlock.yb, 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))