Fix NVR regex for versions with a percentage, and fix dist regex for …

…any EL
rocky-linux · May 2, 2022 · f7017a9 · f7017a9
1 parent dd7fd31
commit f7017a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/rpmutils/regex.go b/pkg/rpmutils/regex.go
@@ -3,9 +3,9 @@ package rpmutils
 import "regexp"
 
 var (
-	Nvr        = regexp.MustCompile("^(\\S+)-([\\w.]+)-(\\w+(?:\\.[\\w+]+)+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
+	Nvr        = regexp.MustCompile("^(\\S+)-([\\w~%.]+)-(\\w+(?:\\.[\\w+]+)+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
 	epoch      = regexp.MustCompile("(\\d+):")
 	module     = regexp.MustCompile("^(.+)-(.+)-([0-9]{19})\\.((?:.+){8})$")
-	dist       = regexp.MustCompile("(\\.el8(?:(?:_\\d)|))")
+	dist       = regexp.MustCompile("(\\.el\\d(?:_\\d|))")
 	moduleDist = regexp.MustCompile("\\.module.+$")
 )