From d513628db90415a27e887c3cf349309b3ad44d55 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Sat, 16 Sep 2023 01:14:36 +0200 Subject: [PATCH] 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. --- routers/api/packages/conan/conan.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index 58e1642442..8edbe98b30 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -326,13 +326,8 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey } defer buf.Close() - if buf.Size() == 0 { - // ignore empty uploads, second request contains content - jsonResponse(ctx, http.StatusOK, nil) - return - } - isConanfileFile := filename == conanfileFile + isConaninfoFile := filename == conaninfoFile pci := &packages_service.PackageCreationInfo{ 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() } - if isConanfileFile || filename == conaninfoFile { + if isConanfileFile || isConaninfoFile { if isConanfileFile { metadata, err := conan_module.ParseConanfile(buf) if err != nil {