Skip to content

fix: rocky edge case #93

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
pohanhuangtw merged 1 commit into from
Nov 27, 2025
Merged

fix: rocky edge case #93

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
10 changes: 9 additions & 1 deletion updater/fetchers/rocky/rocky.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,19 @@ func extractVersionModuleFromNevra(nevra string) (string, string) {
if len(nevraInfo) != 2 {
return "", ""
}

// Strip trailing "-<epoch>" from namePart (the "0" before ':')
moduleName := nevraInfo[0]
if lastPeriod := strings.LastIndex(moduleName, "-"); lastPeriod > 0 {
moduleName = moduleName[:lastPeriod]
}

moduleVersion := nevraInfo[1]
if strings.Contains(moduleVersion, "^") {
// "0^20240806.gee36266-6.el9_5" -> "0.20240806.gee36266-6.el9_5"
moduleVersion = strings.ReplaceAll(moduleVersion, "^", ".")
}

return moduleName, moduleVersion
}

Expand Down Expand Up @@ -185,7 +193,7 @@ func buildFixedInByNamespace(affectedProducts []affectedProduct, packages []pkg)
if _, existing := groupPakcage[pkgVersion]; !existing {
fvVer, err := common.NewVersion(pkgVersion)
if err != nil {
log.WithFields(log.Fields{"err": err, "version": pkgVersion, "ftVer": fvVer}).Debug("Error converting version to FeatureVersion")
log.WithFields(log.Fields{"pkg.Nevra": pkg.Nevra, "version": pkgVersion, "pkgName": pkgName, "err": err}).Error("Error converting version to FeatureVersion")
}

groupPakcage[pkgVersion] = common.FeatureVersion{
Expand Down
1 change: 1 addition & 0 deletions updater/fetchers/rocky/rocky_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestExtractVersionModuleFromNevra(t *testing.T) {
{nevra: "kernel-0:6.12.0-124.8.1.el10_1.aarch64.rpm", moduleName: "kernel", moduleVersion: "6.12.0-124.8.1.el10_1"},
{nevra: "kernel-64k-debug-core-0:6.12.0-124.8.1.el10_1.aarch64.rpm", moduleName: "kernel-64k-debug-core", moduleVersion: "6.12.0-124.8.1.el10_1"},
{nevra: "kernel-abi-stablelists-0:6.12.0-124.8.1.el10_1.noarch.rpm", moduleName: "kernel-abi-stablelists", moduleVersion: "6.12.0-124.8.1.el10_1"},
{nevra: "passt-0:0^20240806.gee36266-6.el9_5.aarch64.rpm", moduleName: "passt", moduleVersion: "0.20240806.gee36266-6.el9_5"},
}
for _, test := range tests {
moduleName, moduleVersion := extractVersionModuleFromNevra(test.nevra)
Expand Down