diff options
| author | zeripath <art27@cantab.net> | 2020-11-28 02:42:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 21:42:08 -0500 |
| commit | 742e21aeba5c02935269a2a3681f4486019ce542 (patch) | |
| tree | e1572ab13c33dec1238321170a90d42851ae4ca2 /models/wiki.go | |
| parent | 5b75f17043bc2a6d0e753ae5c9c6759adad5aaac (diff) | |
| download | gitea-742e21aeba5c02935269a2a3681f4486019ce542.tar.gz gitea-742e21aeba5c02935269a2a3681f4486019ce542.zip | |
Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)
* Ensure errors from IsDir propagate
* Handle errors when checking IsFile
* Handle and propagate errors from IsExist
* Update modules/templates/static.go
* Update modules/templates/static.go
* Return after ctx.ServerError
* Apply suggestions from code review
* Fix tests
The previous merge managed to break repo_form.go
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'models/wiki.go')
| -rw-r--r-- | models/wiki.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/models/wiki.go b/models/wiki.go index 223abf1edc..beab48d45a 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -9,7 +9,8 @@ import ( "path/filepath" "strings" - "github.com/unknwon/com" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) // WikiCloneLink returns clone URLs of repository wiki. @@ -29,5 +30,9 @@ func (repo *Repository) WikiPath() string { // HasWiki returns true if repository has wiki. func (repo *Repository) HasWiki() bool { - return com.IsDir(repo.WikiPath()) + isDir, err := util.IsDir(repo.WikiPath()) + if err != nil { + log.Error("Unable to check if %s is a directory: %v", repo.WikiPath(), err) + } + return isDir } |