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

lorax: Update how the release package is chosen

Browse Source 
Previously the release package was chosen by picking the first package
that provides 'system-release' that isn't named generic. This can cause
branding issues with repos containing multiple system-release packages.

This patch changes _install_branding so that it will give preference to
a system-release package that ends with lowercase --variant name. If
there isn't one it will fall back to the previous behavior.

Resolves: rhbz#1472622
(cherry picked from commit 91d71b09a4)
This commit is contained in:
Brian C. Lane 2020-03-03 17:10:31 -08:00
parent 1fd81854b6
commit e732e244ca
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pylorax/treebuilder.py
View File

@ -89,21 +89,30 @@ class RuntimeBuilder(object):
self.dbo.reset()
def _install_branding(self):
"""Select the branding from the available 'system-release' packages
The *best* way to control this is to have a single package in the repo provide 'system-release'
When there are more than 1 package it will:
- Make a list of the available packages
- If variant is set look for a package ending with lower(variant) and use that
- If there are one or more non-generic packages, use the first one after sorting
"""
release = None
q = self.dbo.sack.query()
a = q.available()
for pkg in a.filter(provides='system-release'):
logger.debug("Found release package %s", pkg)
if pkg.name.startswith('generic'):
continue
else:
release = pkg.name
break
if not release:
logger.error('could not get the release')
pkgs = sorted([p.name for p in a.filter(provides='system-release')
if not p.name.startswith("generic")])
if not pkgs:
logger.error("No system-release packages found, could not get the release")
return
logger.debug("system-release packages: %s", pkgs)
if self.vars.product.variant:
variant = [p for p in pkgs if p.endswith("-"+self.vars.product.variant.lower())]
if variant:
release = variant[0]
if not release:
release = pkgs[0]
# release
logger.info('got release: %s', release)
self._runner.installpkg(release)