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

Allow empty Conan files (#27092) 

Fixes #27090

Looks like the Conan upload process has changed since last year. The
empty uploads don't occur anymore.
pull/27094/head
KN4CK3R 2023-09-16 01:14:36 +07:00 committed by GitHub
parent e5ec57cd60
commit d513628db9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
routers/api/packages/conan/conan.go
Unescape Escape View File

@ -326,13 +326,8 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey
} }
defer buf.Close() defer buf.Close()
if buf.Size() == 0 {
// ignore empty uploads, second request contains content
jsonResponse(ctx, http.StatusOK, nil)
return
}
isConanfileFile := filename == conanfileFile isConanfileFile := filename == conanfileFile
isConaninfoFile := filename == conaninfoFile
pci := &packages_service.PackageCreationInfo{ pci := &packages_service.PackageCreationInfo{
PackageInfo: packages_service.PackageInfo{ PackageInfo: packages_service.PackageInfo{
@ -364,7 +359,7 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey
pfci.Properties[conan_module.PropertyPackageRevision] = pref.RevisionOrDefault() pfci.Properties[conan_module.PropertyPackageRevision] = pref.RevisionOrDefault()
} }
if isConanfileFile || filename == conaninfoFile { if isConanfileFile || isConaninfoFile {
if isConanfileFile { if isConanfileFile {
metadata, err := conan_module.ParseConanfile(buf) metadata, err := conan_module.ParseConanfile(buf)
if err != nil { if err != nil {