Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix RPM/Debian signature key creation #28352

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Fix RPM/Debian signature key creation #28352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22037c2
Remove name parameter.
KN4CK3R Dec 4, 2023
4a40cda
Fix import.
KN4CK3R Dec 4, 2023
198618d
Merge branch 'main' into fix-28324-debian
GiteaBot Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/packages/debian/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
}

func generateKeypair() (string, string, error) {
e, err := openpgp.NewEntity(setting.AppName, "Debian Registry", "", nil)
e, err := openpgp.NewEntity("", "Debian Registry", "", nil)
if err != nil {
return "", "", err
}
Expand Down
4 changes: 2 additions & 2 deletions services/packages/rpm/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"code.gitea.io/gitea/modules/json"
packages_module "code.gitea.io/gitea/modules/packages"
rpm_module "code.gitea.io/gitea/modules/packages/rpm"
"code.gitea.io/gitea/modules/setting"

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / backend 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / checks-backend 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / test-sqlite 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / test-pgsql 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / test-mssql 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / test-mysql 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / lint-backend 

"code.gitea.io/gitea/modules/setting" imported and not used (typecheck)

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / lint-backend 

"code.gitea.io/gitea/modules/setting" imported and not used) (typecheck)

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / test-unit 

"code.gitea.io/gitea/modules/setting" imported and not used

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / lint-go-gogit 

"code.gitea.io/gitea/modules/setting" imported and not used (typecheck)

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / lint-go-gogit 

"code.gitea.io/gitea/modules/setting" imported and not used) (typecheck)

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / lint-go-windows 

"code.gitea.io/gitea/modules/setting" imported and not used (typecheck)

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / lint-go-windows 

"code.gitea.io/gitea/modules/setting" imported and not used) (typecheck)

Check failure on line 25 in services/packages/rpm/repository.go

View workflow job for this annotation

GitHub Actions / test-e2e 

"code.gitea.io/gitea/modules/setting" imported and not used
"code.gitea.io/gitea/modules/util"
packages_service "code.gitea.io/gitea/services/packages"

Expand Down Expand Up @@ -68,7 +68,7 @@
}

func generateKeypair() (string, string, error) {
e, err := openpgp.NewEntity(setting.AppName, "RPM Registry", "", nil)
e, err := openpgp.NewEntity("", "RPM Registry", "", nil)
if err != nil {
return "", "", err
}
Expand Down Expand Up @@ -126,7 +126,7 @@

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 {
pv, err := GetOrCreateRepositoryVersion(ctx, ownerID)
if err != nil {
Expand Down
Loading