Jelajahi Sumber

remove legacy support

Yoginth 7 tahun lalu
induk
melakukan
df9b8387d7
1 mengubah file dengan 4 tambahan dan 19 penghapusan
  1. 4 19
      models/admin.go

+ 4 - 19
models/admin.go

@@ -8,10 +8,8 @@ package models
 
 import (
 	"fmt"
-	"gitote/gitote/pkg/setting"
 	"gitote/gitote/pkg/tool"
 	"os"
-	"os/exec"
 	"strings"
 	"time"
 
@@ -54,9 +52,9 @@ func (n *Notice) TrStr() string {
 
 // CreateNotice creates new system notice.
 func CreateNotice(tp NoticeType, desc string) error {
-	// prevent panic if database connection is not available at this point
+	// Prevent panic if database connection is not available at this point
 	if x == nil {
-		return fmt.Errorf("Could not save notice due database connection not being available: %d %s", tp, desc)
+		return fmt.Errorf("could not save notice due database connection not being available: %d %s", tp, desc)
 	}
 
 	n := &Notice{
@@ -75,25 +73,12 @@ 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) {
-	var err error
-	// LEGACY [Go 1.7, 0.12]: 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 Gitote 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 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 {
+	if err := os.RemoveAll(path); err != nil {
 		desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
 		log.Warn(desc)
 		if err = CreateRepositoryNotice(desc); err != nil {
 			raven.CaptureErrorAndWait(err, nil)
-			log.Error(4, "CreateRepositoryNotice: %v", err)
+			log.Error(2, "CreateRepositoryNotice: %v", err)
 		}
 	}
 }