resf/distro-tools
1
0
Fork 0
mirror of https://github.com/resf/distro-tools.git synced 2024-11-28 16:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Differentiate between module and non-module srcs

Browse Source
This commit is contained in:
Mustafa Gezen 2023-02-03 02:06:13 +01:00
parent e01192cbba
commit 124ccec86a
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apollo/server/routes/api_updateinfo.py
View File

@ -165,15 +165,21 @@ async def get_updateinfo(
pkg_name_map = {} pkg_name_map = {}
for pkg in advisory.packages: for pkg in advisory.packages:
if pkg.package_name not in pkg_name_map: name = pkg.package_name
pkg_name_map[pkg.package_name] = [] if pkg.module_name:
name = f"{pkg.module_name}:{pkg.package_name}:{pkg.module_stream}"
if name not in pkg_name_map:
pkg_name_map[name] = []
pkg_name_map[pkg.package_name].append(pkg) pkg_name_map[name].append(pkg)
pkg_src_rpm = {} pkg_src_rpm = {}
for top_pkg in advisory.packages: for top_pkg in advisory.packages:
if top_pkg.package_name not in pkg_src_rpm: if top_pkg.package_name not in pkg_src_rpm:
for pkg in pkg_name_map[top_pkg.package_name]: name = top_pkg.package_name
if top_pkg.module_name:
name = f"{top_pkg.module_name}:{top_pkg.package_name}:{top_pkg.module_stream}"
for pkg in pkg_name_map[name]:
nvra_no_epoch = EPOCH_RE.sub("", pkg.nevra) nvra_no_epoch = EPOCH_RE.sub("", pkg.nevra)
nvra = NVRA_RE.search(nvra_no_epoch) nvra = NVRA_RE.search(nvra_no_epoch)
if nvra: if nvra:
@ -261,7 +267,11 @@ async def get_updateinfo(
else: else:
continue continue
if pkg.package_name not in pkg_src_rpm: p_name = pkg.package_name
if pkg.module_name:
p_name = f"{pkg.module_name}:{pkg.package_name}:{pkg.module_stream}"
if p_name not in pkg_src_rpm:
continue continue
if arch != product_arch: if arch != product_arch:
continue continue
@ -280,7 +290,7 @@ async def get_updateinfo(
package.set("epoch", epoch) package.set("epoch", epoch)
package.set("version", version) package.set("version", version)
package.set("release", release) package.set("release", release)
package.set("src", pkg_src_rpm[pkg.package_name]) package.set("src", pkg_src_rpm[p_name])
# Add filename element # Add filename element
ET.SubElement(package, ET.SubElement(package,