diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2021-06-23 01:02:33 +0900 |
|---|---|---|
| committer | Carlos Amedee <carlos@golang.org> | 2021-08-03 15:00:47 +0000 |
| commit | 37c117f2bf227b14b0be3e1c2411174a6f27b4fe (patch) | |
| tree | 50ae53b64cd08e4ee7f41d1865b1079b0b0e3d24 | |
| parent | 4c62fd36776c03547f7a9f8dc67c8dac8e987851 (diff) | |
| download | go-37c117f2bf227b14b0be3e1c2411174a6f27b4fe.tar.gz go-37c117f2bf227b14b0be3e1c2411174a6f27b4fe.zip | |
[release-branch.go1.16] cmd/go: use path.Dir instead of filepath.Dir for package paths in 'go mod vendor'
copyMetadata walk-up to parent directory until the pkg become modPath.
But pkg should be slash-separated paths. It have to use path.Dir instead of
filepath.Dir.
Updates #46867
Fixes #47015
Change-Id: I44cf1429fe52379a7415b94cc30ae3275cc430e8
Reviewed-on: https://go-review.googlesource.com/c/go/+/330149
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Trust: Bryan C. Mills <bcmills@google.com>
Trust: Alexander Rakoczy <alex@golang.org>
Trust: Carlos Amedee <carlos@golang.org>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
(cherry picked from commit 835d86a17ebf32a3cb081f66119c74363dbd8825)
Reviewed-on: https://go-review.googlesource.com/c/go/+/332329
Reviewed-by: Jay Conrod <jayconrod@google.com>
| -rw-r--r-- | src/cmd/go/internal/modcmd/vendor.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/go/internal/modcmd/vendor.go b/src/cmd/go/internal/modcmd/vendor.go index ac1fb7720a..4ef8481b43 100644 --- a/src/cmd/go/internal/modcmd/vendor.go +++ b/src/cmd/go/internal/modcmd/vendor.go @@ -13,6 +13,7 @@ import ( "io" "io/fs" "os" + "path" "path/filepath" "sort" "strings" @@ -281,7 +282,7 @@ func copyMetadata(modPath, pkg, dst, src string, copiedFiles map[string]bool) { if modPath == pkg { break } - pkg = filepath.Dir(pkg) + pkg = path.Dir(pkg) dst = filepath.Dir(dst) src = filepath.Dir(src) } |