Remove util.RemoveAll - should have been removed since go 1.7 (#6299)
This commit is contained in:
		
							parent
							
								
									e836b8869b
								
							
						
					
					
						commit
						dbab98c8e0
					
				
					 3 changed files with 2 additions and 31 deletions
				
			
		|  | @ -6,6 +6,7 @@ package models | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
|  | 	"os" | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/util" | 	"code.gitea.io/gitea/modules/util" | ||||||
|  | @ -60,7 +61,7 @@ func RemoveAllWithNotice(title, path string) { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func removeAllWithNotice(e Engine, title, path string) { | func removeAllWithNotice(e Engine, title, path string) { | ||||||
| 	if err := util.RemoveAll(path); err != nil { | 	if err := os.RemoveAll(path); err != nil { | ||||||
| 		desc := fmt.Sprintf("%s [%s]: %v", title, path, err) | 		desc := fmt.Sprintf("%s [%s]: %v", title, path, err) | ||||||
| 		log.Warn(desc) | 		log.Warn(desc) | ||||||
| 		if err = createNotice(e, NoticeRepository, desc); err != nil { | 		if err = createNotice(e, NoticeRepository, desc); err != nil { | ||||||
|  |  | ||||||
|  | @ -1,14 +0,0 @@ | ||||||
| // +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) |  | ||||||
| } |  | ||||||
|  | @ -1,16 +0,0 @@ | ||||||
| // +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() |  | ||||||
| } |  | ||||||
		Loading…
	
		Reference in a new issue