From 5ddf9712e4ea4cd395a52d08bb53a6fd1cdd3594 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 20 Apr 2020 15:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BB=93=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/gitea_create_repository.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/gitea_create_repository.rake b/lib/tasks/gitea_create_repository.rake index 6c6f4fd6..4719a23e 100644 --- a/lib/tasks/gitea_create_repository.rake +++ b/lib/tasks/gitea_create_repository.rake @@ -9,9 +9,9 @@ namespace :gitea_create_repository do all_repositories = Repository.select(:id,:identifier, :user_id,:hidden,:project_id).includes(project: :owner) all_repositories.find_each do |r| user = r.project.owner - if user.gitea_token.present? #防止用户在forge创建了repository，但是在gitea上没有创建用户 + if user && user.try(:gitea_token).present? #防止用户在forge创建了repository，但是在gitea上没有创建用户 repo_status = Gitea::Repository::CheckPresentService.new(user, r.identifier).call - unless repo_status == 200 + unless [200, 201, 204].include?(repo_status) delete_gitea = Gitea::Repository::DeleteService.new(user, r.identifier).call if delete_gitea.status == 204 || delete_gitea.status == 404 #删除成功或者仓库不存在，都重新创建 repository_params= { @@ -26,7 +26,7 @@ namespace :gitea_create_repository do end end else - puts "_________this_user_have_no_gitea_token__login:#{user.login}_________" + puts "_________this_user_have_no_gitea_token__login:#{user&.login}_________" end end puts "__________end_to_create_repository_git___________"