qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 20:14:43 -07:00
Code Releases Activity

x/tools/go/packages/packagestest: fix GOPROXY file URLs for Windows

Browse Source 
On Windows, file URLs should look like file:///C:/foo/bar instead of
file://C:/foo/bar. In the latter case, the "C:" is parsed as the host.

Updates golang/go#31675

Change-Id: I7f75be44dd5d289de3ffdbd20a78130ed03cd233
Reviewed-on: https://go-review.googlesource.com/c/tools/+/173918
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Jay Conrod 2019-04-25 12:07:40 -04:00
parent 36563e24a2
commit 31fd60d6bf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go/packages/packagestest/modules.go
View File

@ -14,6 +14,7 @@ import (
"path"
"path/filepath"
"regexp"
"strings"
"golang.org/x/tools/go/packages"
)
@ -101,6 +102,13 @@ func (modules) Finalize(exported *Exported) error {
return fmt.Errorf("creating module proxy dir for %v: %v", module, err)
}
}
proxyURL := filepath.ToSlash(proxyDir)
if !strings.HasPrefix(proxyURL, "/") {
// Windows paths will look like C:/foo/bar. In the URL, the C: will be
// interpreted as the host, so add a leading /. See golang.org/issue/6027.
proxyURL = "/" + proxyURL
}
proxyURL = "file://" + proxyURL
// Discard the original mod cache dir, which contained the files written
// for us by Export.