Skip to content

Keep trailing module rebuild suffix when matching clones - #98

Open
atomicturtle wants to merge 1 commit into
resf:mainfrom
atomicturtle:fix/8-module-rebuild-suffix
Open

Keep trailing module rebuild suffix when matching clones#98
atomicturtle wants to merge 1 commit into
resf:mainfrom
atomicturtle:fix/8-module-rebuild-suffix

Conversation

@atomicturtle

Copy link
Copy Markdown
Contributor

Summary

  • Fixes #8: clean_nvra used \.module.+$, so httpd-2.4.37-51.module+el8.7.0+1059+126e9251, …+1155+5163394a.1, and …+1182+86a6cd60.5 all cleaned to the same NVR.
  • Production still lists all three RLSAs (RLSA-2022:7647, 2023:0852, 2023:1673) with the first module build.
  • Prefix matching no longer treats 51.1 as a rebuild of 51. .rocky rebuilds still match.

Test plan

  • python3 -m unittest apollo.tests.test_rh_matcher_activities
  • Confirm clean_nvra keys: module.httpd-2.4.37-51.x86_64 vs …-51.1.x86_64 vs …-51.5.x86_64
  • After merge + rematch, RLSA-2023:0852 / 1673 list their own httpd NEVRAs, not +1059+126e9251

Greedy .module.+$ treated httpd 51.module+hash.1 and .5 as the same
NVR as the first 8.7 build, so RLSA-2023:0852 and 1673 cloned the
wrong packages. Prefix matching also accepted 51.1 as a rebuild of 51.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Apollo: Potential bug in module version parsing

1 participant