diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2024-01-19 12:37:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 11:37:10 +0000 |
| commit | 461d8b53c2e51a8a6a1715ba40ac61d7e9f93971 (patch) | |
| tree | 2bad0b2908f9f3e76d9a195c4fe1c66016b8bcbf /modules | |
| parent | 075c4c89ee28590bd4ab8f6cf7338d723c4696eb (diff) | |
| download | gitea-461d8b53c2e51a8a6a1715ba40ac61d7e9f93971.tar.gz gitea-461d8b53c2e51a8a6a1715ba40ac61d7e9f93971.zip | |
Fix some RPM registry flaws (#28782)
Related #26984
(https://github.com/go-gitea/gitea/pull/26984#issuecomment-1889588912)
Fix admin cleanup message.
Fix models `Get` not respecting default values.
Rebuild RPM repository files after cleanup.
Do not add RPM group to package version name.
Force stable sorting of Alpine/Debian/RPM repository data.
Fix missing deferred `Close`.
Add tests for multiple RPM groups.
Removed non-cached `ReplaceAllStringRegex`.
If there are multiple groups available, it's stated in the package
installation screen:
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/packages/rpm/metadata.go | 5 | ||||
| -rw-r--r-- | modules/templates/util_string.go | 5 | ||||
| -rw-r--r-- | modules/util/slice.go | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index 1ba4c73e8d..7fc47a53e6 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -15,7 +15,10 @@ import ( ) const ( - PropertyMetadata = "rpm.metadata" + PropertyMetadata = "rpm.metadata" + PropertyGroup = "rpm.group" + PropertyArchitecture = "rpm.architecture" + SettingKeyPrivate = "rpm.key.private" SettingKeyPublic = "rpm.key.public" diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go index 613940ccdc..18a0d5cacc 100644 --- a/modules/templates/util_string.go +++ b/modules/templates/util_string.go @@ -4,7 +4,6 @@ package templates import ( - "regexp" "strings" "code.gitea.io/gitea/modules/base" @@ -26,10 +25,6 @@ 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) } diff --git a/modules/util/slice.go b/modules/util/slice.go index 6d63ab4a77..a7073fedee 100644 --- a/modules/util/slice.go +++ b/modules/util/slice.go @@ -4,6 +4,7 @@ package util import ( + "cmp" "slices" "strings" ) @@ -45,3 +46,10 @@ func SliceSortedEqual[T comparable](s1, s2 []T) bool { func SliceRemoveAll[T comparable](slice []T, target T) []T { return slices.DeleteFunc(slice, func(t T) bool { return t == target }) } + +// Sorted returns the sorted slice +// Note: The parameter is sorted inline. +func Sorted[S ~[]E, E cmp.Ordered](values S) S { + slices.Sort(values) + return values +} |