diff options
Diffstat (limited to 'modules/repository/hooks.go')
| -rw-r--r-- | modules/repository/hooks.go | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/modules/repository/hooks.go b/modules/repository/hooks.go index faf9c98f8a..aba5db6719 100644 --- a/modules/repository/hooks.go +++ b/modules/repository/hooks.go @@ -15,7 +15,6 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "github.com/unknwon/com" "xorm.io/builder" ) @@ -112,15 +111,27 @@ func CheckDelegateHooks(repoPath string) ([]string, error) { newHookPath := filepath.Join(hookDir, hookName+".d", "gitea") cont := false - if !com.IsExist(oldHookPath) { + isExist, err := util.IsExist(oldHookPath) + if err != nil { + results = append(results, fmt.Sprintf("unable to check if %s exists. Error: %v", oldHookPath, err)) + } + if err == nil && !isExist { results = append(results, fmt.Sprintf("old hook file %s does not exist", oldHookPath)) cont = true } - if !com.IsExist(oldHookPath + ".d") { + isExist, err = util.IsExist(oldHookPath + ".d") + if err != nil { + results = append(results, fmt.Sprintf("unable to check if %s exists. Error: %v", oldHookPath+".d", err)) + } + if err == nil && !isExist { results = append(results, fmt.Sprintf("hooks directory %s does not exist", oldHookPath+".d")) cont = true } - if !com.IsExist(newHookPath) { + isExist, err = util.IsExist(newHookPath) + if err != nil { + results = append(results, fmt.Sprintf("unable to check if %s exists. Error: %v", newHookPath, err)) + } + if err == nil && !isExist { results = append(results, fmt.Sprintf("new hook file %s does not exist", newHookPath)) cont = true } |