Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve

This commit is contained in:
wxiaoguang 2024-11-17 22:30:41 +08:00
parent b460e0dfa7
commit 26c06a365a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/packages/arch/metadata.go
View File

@ -15,6 +15,7 @@ import (
"strings"
"sync"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/packages"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/validation"
@ -282,7 +283,13 @@ func ParsePackageInfo(compressType string, r io.Reader) (*Package, error) {
}
}
return p, errors.Join(scanner.Err(), ValidatePackageSpec(p))
validateErr := ValidatePackageSpec(p)
if validateErr != nil {
// Do not the validation err as fatal error, otherwise if the spec changes we must keep this in sync.
// It is the responsibility of the client to check these when installing a package but for the registry it's less relevant.
log.Error("Error validating arch package spec: %v", validateErr)
}
return p, scanner.Err()
}
// ValidatePackageSpec Arch package validation according to PKGBUILD specification.

2
tests/integration/api_packages_arch_test.go
View File

@ -35,7 +35,7 @@ func TestPackageArch(t *testing.T) {
defer tests.PrepareTestEnv(t)()
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
unpack := func(s string) []byte {
data, _ := base64.StdEncoding.DecodeString(strings.ReplaceAll(strings.ReplaceAll(strings.TrimSpace(s), "\n", ""), "\r", ""))
data, _ := base64.StdEncoding.DecodeString(s)
return data
}
rootURL := fmt.Sprintf("/api/packages/%s/arch", user.Name)