diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2021-04-27 13:51:45 +0200 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2021-04-27 15:50:45 +0000 |
| commit | 88a8a2705684e693082cabaec18b76615cf0b4f0 (patch) | |
| tree | 254f04ca5485f7d1a69b2cab368133cc3b1a8b21 /src/os | |
| parent | 0b9ca4d90737017fc9bb0cf125e2005c61782b79 (diff) | |
| download | go-88a8a2705684e693082cabaec18b76615cf0b4f0.tar.gz go-88a8a2705684e693082cabaec18b76615cf0b4f0.zip | |
os: don't check non-nil err twice in Symlink on windows
Change-Id: I398d324723025b559fdca783fc334de9be68f2d1
Reviewed-on: https://go-review.googlesource.com/c/go/+/314030
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/file_windows.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/os/file_windows.go b/src/os/file_windows.go index 0d3c048a75..a2cb96e457 100644 --- a/src/os/file_windows.go +++ b/src/os/file_windows.go @@ -365,17 +365,14 @@ func Symlink(oldname, newname string) error { flags |= syscall.SYMBOLIC_LINK_FLAG_DIRECTORY } err = syscall.CreateSymbolicLink(n, o, flags) - if err != nil { // the unprivileged create flag is unsupported // below Windows 10 (1703, v10.0.14972). retry without it. flags &^= windows.SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE - err = syscall.CreateSymbolicLink(n, o, flags) - } - - if err != nil { - return &LinkError{"symlink", oldname, newname, err} + if err != nil { + return &LinkError{"symlink", oldname, newname, err} + } } return nil } |