vendor/cmd/go/internal/web2: add missing return to netrcPath
The "plan9" case was missing a return, so its code was a no-op.
Also remove an unnecessary conversion.
Fixup for CL 103866.
Change-Id: I484ec8cc7e2428e0e23e7057e04532f2b74e5d94
Reviewed-on: https://go-review.googlesource.com/104617
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/vendor/cmd/go/internal/web2/web.go b/vendor/cmd/go/internal/web2/web.go
index 9282eeb..d11ee6b 100644
--- a/vendor/cmd/go/internal/web2/web.go
+++ b/vendor/cmd/go/internal/web2/web.go
@@ -41,7 +41,7 @@
func parseNetrc(data string) []netrcLine {
var nrc []netrcLine
var l netrcLine
- for _, line := range strings.Split(string(data), "\n") {
+ for _, line := range strings.Split(data, "\n") {
f := strings.Fields(line)
for i := 0; i < len(f)-1; i += 2 {
switch f[i] {
@@ -76,9 +76,10 @@
case "windows":
return filepath.Join(os.Getenv("USERPROFILE"), "_netrc")
case "plan9":
- filepath.Join(os.Getenv("home"), ".netrc")
+ return filepath.Join(os.Getenv("home"), ".netrc")
+ default:
+ return filepath.Join(os.Getenv("HOME"), ".netrc")
}
- return filepath.Join(os.Getenv("HOME"), ".netrc")
}
func readNetrc() {
