Skip to content

Fix prefix matching in process_repomd NVRA alias lookup #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianclemens merged 1 commit into from
May 21, 2026
Merged

Fix prefix matching in process_repomd NVRA alias lookup #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions apollo/rpmworker/rh_matcher_activities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ async def process_repomd(

ret = {}
raw_pkg_nvras = {}
raw_package_map = {}
pkg_name_map = {}
for pkg in all_pkgs:
# in the case of a module nvra the cleaned variable
# becomes the package stripped of any module information
Expand All @@ -688,9 +688,10 @@ async def process_repomd(
raw_pkg_nvras[cleaned] = []
raw_pkg_nvras[cleaned].append(pkg)

if name not in raw_package_map:
raw_package_map[name] = []
raw_package_map[name].append(raw)
if name not in pkg_name_map:
pkg_name_map[name] = []
if cleaned not in pkg_name_map[name]:
pkg_name_map[name].append(cleaned)

nvra_alias = {}
check_pkgs = set()
Expand Down Expand Up @@ -719,8 +720,8 @@ async def process_repomd(
# Check if we can match the prefix instead
# First let's fetch the name matching NVRAs
# To cut down on the number of checks
name_pkgs = raw_package_map.get(name, [])
# pkg_nvra's will be 'cleaned'
name_pkgs = pkg_name_map.get(name, [])
# pkg_name_map values are cleaned NVRAs
for pkg_nvra in name_pkgs:
pkg_nvra_rs = pkg_nvra.rsplit(".", 1)
cleaned_rs = cleaned.rsplit(".", 1)
Expand Down
Loading
Loading