Skip to content

Commit 04ab306

Browse files
committed
fix: add support for content style EPEL labels
1 parent e455ba4 commit 04ab306

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

listener/upload.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,8 @@ func fixEpelRepos(sys *inventory.SystemProfile, repos []string) []string {
512512
for i, r := range repos {
513513
if r == "epel" {
514514
repos[i] = fmt.Sprintf("%s-%d", r, sys.OperatingSystem.Major)
515+
} else if strings.HasPrefix(r, fmt.Sprintf("EPEL_%d", sys.OperatingSystem.Major)) {
516+
repos[i] = fmt.Sprintf("epel-%d", sys.OperatingSystem.Major)
515517
}
516518
}
517519
return repos

listener/upload_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,11 @@ func TestFixEpelRepos(t *testing.T) {
296296
var sys = inventory.SystemProfile{}
297297
repos = fixEpelRepos(&sys, repos)
298298
assert.Equal(t, "epel", repos[0])
299+
300+
reposContent := []string{"EPEL_9_Everything_x86_64"}
301+
var sysContent = inventory.SystemProfile{OperatingSystem: inventory.OperatingSystem{Major: 9}}
302+
reposContent = fixEpelRepos(&sysContent, reposContent)
303+
assert.Equal(t, "epel-9", reposContent[0])
299304
}
300305

301306
func TestUpdateSystemPlatformYumUpdates(t *testing.T) {

0 commit comments

Comments
 (0)