From ba4d0b8ffbd78473273800f586ae8bde55cda6c5 Mon Sep 17 00:00:00 2001 From: Exploding Dragon Date: Fri, 12 Jan 2024 11:16:05 +0800 Subject: Support for grouping RPMs using paths (#26984) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current rpm repository places all packages in the same repository, and different systems (el7,f34) may hit packages that do not belong to this distribution ( #25304 ) , which now supports grouping of rpm. ![图片](https://github.com/go-gitea/gitea/assets/33776693/d1e1d99f-7799-4b2b-a19b-cb2a5c692914) Fixes #25304 . Fixes #27056 . Refactor: [#25866](https://github.com/go-gitea/gitea/pull/25866) --- modules/packages/rpm/metadata.go | 3 +-- modules/templates/util_string.go | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index f019a8dde1..1ba4c73e8d 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -15,8 +15,7 @@ import ( ) const ( - PropertyMetadata = "rpm.metadata" - + PropertyMetadata = "rpm.metadata" SettingKeyPrivate = "rpm.key.private" SettingKeyPublic = "rpm.key.public" diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go index 18a0d5cacc..613940ccdc 100644 --- a/modules/templates/util_string.go +++ b/modules/templates/util_string.go @@ -4,6 +4,7 @@ package templates import ( + "regexp" "strings" "code.gitea.io/gitea/modules/base" @@ -25,6 +26,10 @@ func (su *StringUtils) Contains(s, substr string) bool { return strings.Contains(s, substr) } +func (su *StringUtils) ReplaceAllStringRegex(s, regex, new string) string { + return regexp.MustCompile(regex).ReplaceAllString(s, new) +} + func (su *StringUtils) Split(s, sep string) []string { return strings.Split(s, sep) } -- cgit v1.2.3