diff options
| author | Bo-Yi Wu <appleboy.tw@gmail.com> | 2017-03-29 10:05:23 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-03-29 10:05:23 +0800 |
| commit | 08f7fded3c097685af9370283fc8565b80fb0615 (patch) | |
| tree | c57267d7d4b3d3c1027030398b128d254c2f42f6 /models/admin.go | |
| parent | 6a451a2b5986bf5c27f20a00000495da1064c386 (diff) | |
| download | gitea-08f7fded3c097685af9370283fc8565b80fb0615.tar.gz gitea-08f7fded3c097685af9370283fc8565b80fb0615.zip | |
refactor: remove workaround after the golang 1.7 release. (#1349)
* refactor: remove workaround after the golang 1.7 release.
* remove unused import.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
* refactor: Add remove function.
* refactor: rename
* refactor: update build flag
Diffstat (limited to 'models/admin.go')
| -rw-r--r-- | models/admin.go | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/models/admin.go b/models/admin.go index e573c9ba79..f8645202d8 100644 --- a/models/admin.go +++ b/models/admin.go @@ -6,16 +6,13 @@ package models import ( "fmt" - "os" - "os/exec" - "strings" "time" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" + "github.com/Unknwon/com" "github.com/go-xorm/xorm" - - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" ) //NoticeType describes the notice type @@ -79,19 +76,7 @@ func RemoveAllWithNotice(title, path string) { } func removeAllWithNotice(e Engine, title, path string) { - var err error - // workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606 - // this bug should be fixed on Go 1.7, so the workaround should be removed when Gogs don't support Go 1.6 anymore: - // https://github.com/golang/go/commit/2ffb3e5d905b5622204d199128dec06cefd57790 - if setting.IsWindows { - // converting "/" to "\" in path on Windows - path = strings.Replace(path, "/", "\\", -1) - err = exec.Command("cmd", "/C", "rmdir", "/S", "/Q", path).Run() - } else { - err = os.RemoveAll(path) - } - - if err != nil { + if err := util.RemoveAll(path); err != nil { desc := fmt.Sprintf("%s [%s]: %v", title, path, err) log.Warn(desc) if err = createNotice(e, NoticeRepository, desc); err != nil { |