diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index 379fd81f67..dc51956aef 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -23,6 +23,11 @@ import ( "github.com/mholt/archiver/v3" ) +const ( + PropertyDescription = "arch.description" + PropertySignature = "arch.signature" +) + var ( // https://man.archlinux.org/man/PKGBUILD.5 reName = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+$`) diff --git a/services/packages/arch/service.go b/services/packages/arch/service.go index aa11a73048..a5859009c0 100644 --- a/services/packages/arch/service.go +++ b/services/packages/arch/service.go @@ -44,7 +44,7 @@ func GetPackageSignature(ctx *context.Context, distro, file string) (*bytes.Read } for _, pp := range proprs { - if pp.Name == "sign" { + if pp.Name == arch_module.PropertySignature { b, err := hex.DecodeString(pp.Value) if err != nil { return nil, err @@ -116,7 +116,7 @@ func CreatePacmanDb(ctx *context.Context, owner, arch, distro string) (*bytes.Bu } pps, err := packages_model.GetPropertiesByName( - ctx, packages_model.PropertyTypeFile, pf.ID, "desc", + ctx, packages_model.PropertyTypeFile, pf.ID, arch_module.PropertyDescription, ) if err != nil { return nil, err diff --git a/services/packages/arch/upload.go b/services/packages/arch/upload.go index 654bbebf9b..0a5e7eb245 100644 --- a/services/packages/arch/upload.go +++ b/services/packages/arch/upload.go @@ -37,14 +37,14 @@ func UploadArchPackage(ctx *context.Context, upload io.Reader, filename, distro, } properties := map[string]string{ - "desc": p.Desc(), + arch_module.PropertyDescription: p.Desc(), } if sign != "" { _, err := hex.DecodeString(sign) if err != nil { return true, nil, errors.New("unable to decode package signature") } - properties["sign"] = sign + properties[arch_module.PropertySignature] = sign } ver, _, err := packages_service.CreatePackageOrAddFileToExisting(