Skip to content

Commit aeeccc9

Browse files
GiteaBotlunnywxiaoguang
authored
Deleting repository should unlink all related packages (#33653) (#33673)
Backport #33653 by @lunny Fix #33634 Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent 37e99d9 commit aeeccc9

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

services/repository/delete.go

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
git_model "code.gitea.io/gitea/models/git"
1717
issues_model "code.gitea.io/gitea/models/issues"
1818
"code.gitea.io/gitea/models/organization"
19+
packages_model "code.gitea.io/gitea/models/packages"
1920
access_model "code.gitea.io/gitea/models/perm/access"
2021
project_model "code.gitea.io/gitea/models/project"
2122
repo_model "code.gitea.io/gitea/models/repo"
@@ -273,6 +274,11 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID
273274
return err
274275
}
275276

277+
// unlink packages linked to this repository
278+
if err = packages_model.UnlinkRepositoryFromAllPackages(ctx, repoID); err != nil {
279+
return err
280+
}
281+
276282
if err = committer.Commit(); err != nil {
277283
return err
278284
}

services/repository/repository.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"code.gitea.io/gitea/models/git"
1212
issues_model "code.gitea.io/gitea/models/issues"
1313
"code.gitea.io/gitea/models/organization"
14-
packages_model "code.gitea.io/gitea/models/packages"
1514
repo_model "code.gitea.io/gitea/models/repo"
1615
system_model "code.gitea.io/gitea/models/system"
1716
"code.gitea.io/gitea/models/unit"
@@ -63,11 +62,7 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod
6362
notify_service.DeleteRepository(ctx, doer, repo)
6463
}
6564

66-
if err := DeleteRepositoryDirectly(ctx, doer, repo.ID); err != nil {
67-
return err
68-
}
69-
70-
return packages_model.UnlinkRepositoryFromAllPackages(ctx, repo.ID)
65+
return DeleteRepositoryDirectly(ctx, doer, repo.ID)
7166
}
7267

7368
// PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace

0 commit comments

Comments
 (0)