mirror of
https://github.com/rocky-linux/peridot.git
synced 2024-12-21 02:08:29 +00:00
Merge pull request #113 from mstg/fix-nvr-for-upload
Allow ^ in version (NVR)
This commit is contained in:
commit
320a10d11c
@ -48,7 +48,7 @@ var (
|
|||||||
|
|
||||||
func NVR() *regexp.Regexp {
|
func NVR() *regexp.Regexp {
|
||||||
if nvr == nil {
|
if nvr == nil {
|
||||||
nvr = regexp.MustCompile("^(\\S+)-([\\w~%.+]+)-(\\w+(?:\\.[\\w~%+]+)+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
|
nvr = regexp.MustCompile("^(\\S+)-([\\w~%.+^]+)-(\\w+(?:\\.[\\w~%+]+)+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
|
||||||
}
|
}
|
||||||
return nvr
|
return nvr
|
||||||
}
|
}
|
||||||
@ -62,7 +62,7 @@ func NVRNoArch() *regexp.Regexp {
|
|||||||
|
|
||||||
func NVRUnusualRelease() *regexp.Regexp {
|
func NVRUnusualRelease() *regexp.Regexp {
|
||||||
if nvrUnusualRelease == nil {
|
if nvrUnusualRelease == nil {
|
||||||
nvrUnusualRelease = regexp.MustCompile("^(\\S+)-([\\w~%.+]+)-(\\w+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
|
nvrUnusualRelease = regexp.MustCompile("^(\\S+)-([\\w~%.+^]+)-(\\w+?)(?:\\.(\\w+))?(?:\\.rpm)?$")
|
||||||
}
|
}
|
||||||
return nvrUnusualRelease
|
return nvrUnusualRelease
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user