qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 17:16:54 -07:00
Code Releases Activity

cmd/go: use path.Dir instead of filepath.Dir for package paths in 'go mod vendor'

Browse Source 
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>
This commit is contained in:
Yasuhiro Matsumoto 2021-06-23 01:02:33 +09:00 committed by Bryan C. Mills
parent eb437ba92c
commit 835d86a17e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/go/internal/modcmd/vendor.go
View File

@ -13,6 +13,7 @@ import (
"io" "io"
"io/fs" "io/fs"
"os" "os"
"path"
"path/filepath" "path/filepath"
"sort" "sort"
"strings" "strings"
@ -299,7 +300,7 @@ func copyMetadata(modPath, pkg, dst, src string, copiedFiles map[string]bool) {
if modPath == pkg { if modPath == pkg {
break break
} }
pkg = filepath.Dir(pkg) pkg = path.Dir(pkg)
dst = filepath.Dir(dst) dst = filepath.Dir(dst)
src = filepath.Dir(src) src = filepath.Dir(src)
} }