瀏覽代碼

[annex] annex uninit repo before delete

cgars 8 年之前
父節點
當前提交
43bbc91bd1
共有 1 個文件被更改,包括 26 次插入1 次删除
  1. 26 1
      models/admin.go

+ 26 - 1
models/admin.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/G-Node/gogs/pkg/setting"
 	"github.com/G-Node/gogs/pkg/tool"
+	"github.com/G-Node/go-annex"
 )
 
 type NoticeType int
@@ -72,7 +73,31 @@ func CreateRepositoryNotice(desc string) error {
 // RemoveAllWithNotice removes all directories in given path and
 // creates a system notice when error occurs.
 func RemoveAllWithNotice(title, path string) {
-	if err := os.RemoveAll(path); err != nil {
+	var err error
+	// LEGACY [Go 1.7]: 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
+	// Note: Windows complains when delete target does not exist, therefore we can skip deletion in such cases.
+
+	if msg, err := gannex.AUInit(path); err != nil {
+		if strings.Contains(msg, "If you don't care about preserving the data") {
+			log.Trace("Annex uninit Repo:%s", msg)
+		} else {
+			log.Error(1, "Could not annex uninit repo. Error: %s,%s", err, msg)
+		}
+	} else {
+		log.Trace("Annex uninit Repo:%s", msg)
+	}
+
+	if setting.IsWindows && com.IsExist(path) {
+		// 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 {
 		desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
 		log.Warn(desc)
 		if err = CreateRepositoryNotice(desc); err != nil {