mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 00:54:43 +01:00 
			
		
		
		
	Backport #33653 by @lunny Fix #33634 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		
							parent
							
								
									37e99d9b34
								
							
						
					
					
						commit
						aeeccc9642
					
				| @ -16,6 +16,7 @@ import ( | |||||||
| 	git_model "code.gitea.io/gitea/models/git" | 	git_model "code.gitea.io/gitea/models/git" | ||||||
| 	issues_model "code.gitea.io/gitea/models/issues" | 	issues_model "code.gitea.io/gitea/models/issues" | ||||||
| 	"code.gitea.io/gitea/models/organization" | 	"code.gitea.io/gitea/models/organization" | ||||||
|  | 	packages_model "code.gitea.io/gitea/models/packages" | ||||||
| 	access_model "code.gitea.io/gitea/models/perm/access" | 	access_model "code.gitea.io/gitea/models/perm/access" | ||||||
| 	project_model "code.gitea.io/gitea/models/project" | 	project_model "code.gitea.io/gitea/models/project" | ||||||
| 	repo_model "code.gitea.io/gitea/models/repo" | 	repo_model "code.gitea.io/gitea/models/repo" | ||||||
| @ -273,6 +274,11 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID | |||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	// unlink packages linked to this repository | ||||||
|  | 	if err = packages_model.UnlinkRepositoryFromAllPackages(ctx, repoID); err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
| 	if err = committer.Commit(); err != nil { | 	if err = committer.Commit(); err != nil { | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
|  | |||||||
| @ -11,7 +11,6 @@ import ( | |||||||
| 	"code.gitea.io/gitea/models/git" | 	"code.gitea.io/gitea/models/git" | ||||||
| 	issues_model "code.gitea.io/gitea/models/issues" | 	issues_model "code.gitea.io/gitea/models/issues" | ||||||
| 	"code.gitea.io/gitea/models/organization" | 	"code.gitea.io/gitea/models/organization" | ||||||
| 	packages_model "code.gitea.io/gitea/models/packages" |  | ||||||
| 	repo_model "code.gitea.io/gitea/models/repo" | 	repo_model "code.gitea.io/gitea/models/repo" | ||||||
| 	system_model "code.gitea.io/gitea/models/system" | 	system_model "code.gitea.io/gitea/models/system" | ||||||
| 	"code.gitea.io/gitea/models/unit" | 	"code.gitea.io/gitea/models/unit" | ||||||
| @ -63,11 +62,7 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod | |||||||
| 		notify_service.DeleteRepository(ctx, doer, repo) | 		notify_service.DeleteRepository(ctx, doer, repo) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if err := DeleteRepositoryDirectly(ctx, doer, repo.ID); err != nil { | 	return DeleteRepositoryDirectly(ctx, doer, repo.ID) | ||||||
| 		return err |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	return packages_model.UnlinkRepositoryFromAllPackages(ctx, repo.ID) |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace | // PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user