Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

refactor: remove workaround after the golang 1.7 release. (#1349)

Browse source 
* 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
This commit is contained in:
Bo-Yi Wu 2017-03-29 10:05:23 +08:00 committed by Lunny Xiao
parent 6a451a2b59
commit 08f7fded3c
3 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
models/admin.go
View file

@ -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 {

14
modules/util/remove.go Normal file
View file

@ -0,0 +1,14 @@
// +build !windows,!go1.7 go1.7
// Copyright 2017 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package util
import "os"
// RemoveAll files from Go version 1.7 onward
func RemoveAll(path string) error {
return os.RemoveAll(path)
}

16
modules/util/remove_windows.go Normal file
View file

@ -0,0 +1,16 @@
// +build windows,!go1.7
// Copyright 2017 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package util
// RemoveAll files from path on windows
// 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 Gitea don't support Go 1.6 anymore:
// https://github.com/golang/go/commit/2ffb3e5d905b5622204d199128dec06cefd57790
func RemoveAll(path string) error {
path = strings.Replace(path, "/", "\\", -1)
return exec.Command("cmd", "/C", "rmdir", "/S", "/Q", path).Run()
}