Skip to content

Fix NVRA regex parsing for EL10 packages #83

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
rockythorn merged 1 commit into from
May 29, 2026
Merged

Fix NVRA regex parsing for EL10 packages #83

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
6 changes: 3 additions & 3 deletions apollo/rpmworker/repomd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
import yaml

NVRA_RE = re.compile(
r"^(\S+)-([\w~%.+^]+)-(\w+(?:\.[\w~%+]+)+?)(?:\.(\w+))?(?:\.rpm)?$"
r"^(\S+)-([\w~%.+^]+)-([\w~^]+(?:\.[\w~%+^]+)+?)(?:\.(\w+))?(?:\.rpm)?$"
)
NEVRA_RE = re.compile(
r"^(\S+)-(?:(\d)+:)([\w~%.+^]+)-(\w+(?:\.[\w~%+]+)+?)(?:\.(\w+))?(?:\.rpm)?$"
r"^(\S+)-(?:(\d)+:)([\w~%.+^]+)-([\w~^]+(?:\.[\w~%+^]+)+?)(?:\.(\w+))?(?:\.rpm)?$"
)
EPOCH_RE = re.compile(r"(\d+):")
DIST_RE = re.compile(r"(\.el\d(?:_\d|))")
DIST_RE = re.compile(r"(\.el\d+(?:_\d+|))")
MODULE_DIST_RE = re.compile(r"\.module.+$")


Expand Down
8 changes: 7 additions & 1 deletion apollo/rpmworker/rh_matcher_activities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,13 @@ async def process_repomd(
# becomes the package stripped of any module information
# and with the nvra prepended with 'module.'
cleaned, raw = repomd.clean_nvra_pkg(pkg)
name = repomd.NVRA_RE.search(cleaned).group(1)
match = repomd.NVRA_RE.search(cleaned)
if not match:
logger.warning(
"Skipping package with unrecognized NVRA: %s", cleaned
)
continue
name = match.group(1)

if cleaned not in raw_pkg_nvras:
raw_pkg_nvras[cleaned] = []
Expand Down
Loading