forked from gitea/gitea
Backport #28352 by @KN4CK3R Fixes #28324 The name parameter can't contain some characters (https://github.com/keybase/go-crypto/blob/master/openpgp/keys.go#L680) but is optional. Therefore just use an empty string. Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
This commit is contained in:
parent
bf537adf8a
commit
b71d4c3ec0
|
@ -67,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateKeypair() (string, string, error) {
|
func generateKeypair() (string, string, error) {
|
||||||
e, err := openpgp.NewEntity(setting.AppName, "Debian Registry", "", nil)
|
e, err := openpgp.NewEntity("", "Debian Registry", "", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,6 @@ import (
|
||||||
"code.gitea.io/gitea/modules/json"
|
"code.gitea.io/gitea/modules/json"
|
||||||
packages_module "code.gitea.io/gitea/modules/packages"
|
packages_module "code.gitea.io/gitea/modules/packages"
|
||||||
rpm_module "code.gitea.io/gitea/modules/packages/rpm"
|
rpm_module "code.gitea.io/gitea/modules/packages/rpm"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
|
||||||
"code.gitea.io/gitea/modules/util"
|
"code.gitea.io/gitea/modules/util"
|
||||||
packages_service "code.gitea.io/gitea/services/packages"
|
packages_service "code.gitea.io/gitea/services/packages"
|
||||||
|
|
||||||
|
@ -68,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateKeypair() (string, string, error) {
|
func generateKeypair() (string, string, error) {
|
||||||
e, err := openpgp.NewEntity(setting.AppName, "RPM Registry", "", nil)
|
e, err := openpgp.NewEntity("", "RPM Registry", "", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
|
@ -126,7 +125,7 @@ type packageData struct {
|
||||||
|
|
||||||
type packageCache = map[*packages_model.PackageFile]*packageData
|
type packageCache = map[*packages_model.PackageFile]*packageData
|
||||||
|
|
||||||
// BuildSpecificRepositoryFiles builds metadata files for the repository
|
// BuildRepositoryFiles builds metadata files for the repository
|
||||||
func BuildRepositoryFiles(ctx context.Context, ownerID int64) error {
|
func BuildRepositoryFiles(ctx context.Context, ownerID int64) error {
|
||||||
pv, err := GetOrCreateRepositoryVersion(ctx, ownerID)
|
pv, err := GetOrCreateRepositoryVersion(ctx, ownerID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue