rocky-linux/peridot
4
0
Fork 0
mirror of https://github.com/rocky-linux/peridot.git synced 2024-09-16 18:02:36 +00:00
Code Issues Projects Releases Activity

Merge pull request #192 from rocky-linux/fix/debuginfo

Browse Source 
fix: match against a regex for debug* packages
This commit is contained in:
resf-prow[bot] 2024-07-23 22:11:25 +00:00 committed by GitHub
commit dba4868fbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
peridot/composetools/rpm.go
View File

@ -33,12 +33,14 @@ package composetools
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/gobwas/glob"
"path/filepath" "path/filepath"
"regexp"
"strings"
"github.com/gobwas/glob"
"peridot.resf.org/apollo/rpmutils" "peridot.resf.org/apollo/rpmutils"
"peridot.resf.org/peridot/yummeta" "peridot.resf.org/peridot/yummeta"
"peridot.resf.org/utils" "peridot.resf.org/utils"
"strings"
) )
var ( var (
@ -47,6 +49,7 @@ var (
var ( var (
debugSuffixes = []string{"-debuginfo", "-debugsource", "-debuginfo-common"} debugSuffixes = []string{"-debuginfo", "-debugsource", "-debuginfo-common"}
debugRegex = regexp.MustCompile(`^(?:.*-debuginfo(?:-.*)?|.*-debuginfo-.*|.*-debugsource)$`)
soGlob = glob.MustCompile("*.so.*") soGlob = glob.MustCompile("*.so.*")
gtk2EnginesGlob = glob.MustCompile("/usr/lib*/gtk-2.0/*/engines") gtk2EnginesGlob = glob.MustCompile("/usr/lib*/gtk-2.0/*/engines")
gtk2ModulesGlob = glob.MustCompile("/usr/lib*/gtk-2.0/*/modules") gtk2ModulesGlob = glob.MustCompile("/usr/lib*/gtk-2.0/*/modules")
@ -70,12 +73,9 @@ func StripDebugSuffixes(name string) string {
} }
func IsDebugPackage(name string) bool { func IsDebugPackage(name string) bool {
for _, suffix := range debugSuffixes { if debugRegex.MatchString(name) {
if strings.HasSuffix(name, suffix) { return true
return true
}
} }
return false return false
} }