lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4291 from tklauser/x-sys-windows-err-const

Browse Source 
tools: use ERROR_SHARING_VIOLATION const from golang.org/x/sys/windows
This commit is contained in:
Chris Darroch 2020-10-26 11:55:04 -07:00 committed by GitHub
commit 817cd9e6a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/robustio_windows.go
View File

@ -4,14 +4,9 @@ package tools
import (
"os"
"syscall"
"github.com/avast/retry-go"
)
const (
// This is private in [go]/src/internal/syscall/windows/syscall_windows.go :(
ERROR_SHARING_VIOLATION syscall.Errno = 32
"golang.org/x/sys/windows"
)
func underlyingError(err error) error {
@ -29,10 +24,10 @@ func underlyingError(err error) error {
// isEphemeralError returns true if err may be resolved by waiting.
func isEphemeralError(err error) bool {
// TODO: Use this instead for Go >= 1.13
// return errors.Is(err, ERROR_SHARING_VIOLATION)
// return errors.Is(err, windows.ERROR_SHARING_VIOLATION)
err = underlyingError(err)
return err == ERROR_SHARING_VIOLATION
return err == windows.ERROR_SHARING_VIOLATION
}
func RobustRename(oldpath, newpath string) error {