From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 27 Apr 2021 11:51:45 +0000 (+0200)
Subject: os: don't check non-nil err twice in Symlink on windows
X-Git-Tag: go1.17beta1~428
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=88a8a2705684e693082cabaec18b76615cf0b4f0;p=gostls13.git

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>
---

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
 }