From 27fa8158ef4e2bd827e6a6768e4cb4ac0b5dab82 Mon Sep 17 00:00:00 2001 From: Danila Fominykh Date: Tue, 8 Aug 2023 19:46:58 +0300 Subject: [PATCH] fixed database creation procedure for packages with any architecture --- services/packages/arch/service.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/packages/arch/service.go b/services/packages/arch/service.go index bbe8e87626..9b10a0dace 100644 --- a/services/packages/arch/service.go +++ b/services/packages/arch/service.go @@ -97,15 +97,21 @@ func CreatePacmanDb(ctx *context.Context, p *DbParams) ([]byte, error) { }) for _, version := range versions { - p, err := pkg_model.GetPropertieWithUniqueName(ctx, fmt.Sprintf( + pp, err := pkg_model.GetPropertieWithUniqueName(ctx, fmt.Sprintf( "%s-%s-%s-%s.pkg.tar.zst.desc", p.Distribution, pkg.Name, version.Version, p.Architecture, )) if err != nil { - return nil, err + pp, err = pkg_model.GetPropertieWithUniqueName(ctx, fmt.Sprintf( + "%s-%s-%s-any.pkg.tar.zst.desc", + p.Distribution, pkg.Name, version.Version, + )) + if err != nil { + return nil, err + } } - entries[pkg.Name+"-"+version.Version+"/desc"] = []byte(p.Value) + entries[pkg.Name+"-"+version.Version+"/desc"] = []byte(pp.Value) break } }