diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2021-06-23 01:02:33 +0900 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2021-07-01 17:10:36 +0000 |
| commit | 835d86a17ebf32a3cb081f66119c74363dbd8825 (patch) | |
| tree | fb49b5322dc5c4cb3bde19ec1c66feb78e58c680 | |
| parent | eb437ba92cbb08a86ae064cbd7376c4a8e80485b (diff) | |
| download | go-835d86a17ebf32a3cb081f66119c74363dbd8825.tar.gz go-835d86a17ebf32a3cb081f66119c74363dbd8825.zip | |
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.
Fixes #46867
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>
| -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 8e1c0432f7..713d5f9f3f 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" @@ -299,7 +300,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) } |