Fix NVR regex for versions with a percentage, and fix dist regex for any EL
This commit is contained in:
parent
dd7fd31ebb
commit
f7017a9eac
|
@ -3,9 +3,9 @@ package rpmutils
|
||||||
import "regexp"
|
import "regexp"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
Nvr = regexp.MustCompile("^(\\S+)-([\\w.]+)-(\\w+(?:\\.[\\w+]+)+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
|
Nvr = regexp.MustCompile("^(\\S+)-([\\w~%.]+)-(\\w+(?:\\.[\\w+]+)+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
|
||||||
epoch = regexp.MustCompile("(\\d+):")
|
epoch = regexp.MustCompile("(\\d+):")
|
||||||
module = regexp.MustCompile("^(.+)-(.+)-([0-9]{19})\\.((?:.+){8})$")
|
module = regexp.MustCompile("^(.+)-(.+)-([0-9]{19})\\.((?:.+){8})$")
|
||||||
dist = regexp.MustCompile("(\\.el8(?:(?:_\\d)|))")
|
dist = regexp.MustCompile("(\\.el\\d(?:_\\d|))")
|
||||||
moduleDist = regexp.MustCompile("\\.module.+$")
|
moduleDist = regexp.MustCompile("\\.module.+$")
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue