diff options
| author | Filippo Valsorda <filippo@golang.org> | 2021-08-09 12:37:04 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2021-08-09 12:37:04 -0400 |
| commit | dd96ded6c86b8a38f49fa087b758455243a0f08c (patch) | |
| tree | f1a70c0194af60202025ad135d1ee903e20896c3 /src/cmd/go/internal/modcmd/vendor.go | |
| parent | ddf078e08dc61f38e26f9969dd2a2151a8c73904 (diff) | |
| parent | acbe242f8a2cae8ef4749806291a37d23089b572 (diff) | |
| download | go-dd96ded6c86b8a38f49fa087b758455243a0f08c.tar.gz go-dd96ded6c86b8a38f49fa087b758455243a0f08c.zip | |
[dev.boringcrypto.go1.15] all: merge go1.15.15 into dev.boringcrypto.go1.15dev.boringcrypto.go1.15
Change-Id: I3b20c90322a0c0deec68a161b8fcbab9188fb6b2
Diffstat (limited to 'src/cmd/go/internal/modcmd/vendor.go')
| -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 5a5bb943a5..d83b3de3e5 100644 --- a/src/cmd/go/internal/modcmd/vendor.go +++ b/src/cmd/go/internal/modcmd/vendor.go @@ -10,6 +10,7 @@ import ( "io" "io/ioutil" "os" + "path" "path/filepath" "sort" "strings" @@ -192,7 +193,7 @@ func copyMetadata(modPath, pkg, dst, src string) { if modPath == pkg { break } - pkg = filepath.Dir(pkg) + pkg = path.Dir(pkg) dst = filepath.Dir(dst) src = filepath.Dir(src) } |