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

Fix pkglist for modules

Browse Source
This commit is contained in:
Mustafa Gezen 2023-02-04 02:15:01 +01:00
parent 5dde117301
commit 6300c73b56
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,21 +175,21 @@ async def get_updateinfo(
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: name = top_pkg.package_name
name = top_pkg.package_name if top_pkg.module_name:
if top_pkg.module_name: name = f"{top_pkg.module_name}:{top_pkg.package_name}:{top_pkg.module_stream}"
name = f"{top_pkg.module_name}:{top_pkg.package_name}:{top_pkg.module_stream}" if name not in pkg_src_rpm:
for pkg in pkg_name_map[name]: 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:
name = nvra.group(1) nvr_name = nvra.group(1)
arch = nvra.group(4) nvr_arch = nvra.group(4)
if pkg.package_name == name and arch == "src": if pkg.package_name == nvr_name and nvr_arch == "src":
src_rpm = nvra_no_epoch src_rpm = nvra_no_epoch
if not src_rpm.endswith(".rpm"): if not src_rpm.endswith(".rpm"):
src_rpm += ".rpm" src_rpm += ".rpm"
pkg_src_rpm[pkg.package_name] = src_rpm pkg_src_rpm[name] = src_rpm
# Collection list, may be more than one if module RPMs are involved # Collection list, may be more than one if module RPMs are involved
collections = {} collections = {}
@ -228,6 +228,8 @@ async def get_updateinfo(
if no_default_collection and default_collection_short in collections: if no_default_collection and default_collection_short in collections:
del collections[default_collection_short] del collections[default_collection_short]
collections_added = 0
for collection_short, info in collections.items(): for collection_short, info in collections.items():
# Create collection # Create collection
collection = ET.Element("collection") collection = ET.Element("collection")
@ -305,6 +307,10 @@ async def get_updateinfo(
if added_pkg_count > 0: if added_pkg_count > 0:
packages.append(collection) packages.append(collection)
collections_added += 1
if collections_added == 0:
tree.remove(update)
ET.indent(tree) ET.indent(tree)
xml_str = ET.tostring(tree, encoding="unicode", method="xml") xml_str = ET.tostring(tree, encoding="unicode", method="xml")