From bd5de19b368536574682c45cca9f7864a4eca6d2 Mon Sep 17 00:00:00 2001 From: David Barshow Date: Tue, 7 Feb 2023 17:30:05 +0000 Subject: [PATCH] cmd/go: mod vendor: fixed checking for vendor directory In our case I was using a "vendor-replace" directory which was incorrectly flagged as being in the vendor directory. Change-Id: I8208243ea8416ee7cb4de30e907bcfc25c2d3f27 GitHub-Last-Rev: d183a94d03225ee529c4906a64a289f02eaf7684 GitHub-Pull-Request: golang/go#58287 Reviewed-on: https://go-review.googlesource.com/c/go/+/465036 TryBot-Result: Gopher Robot Run-TryBot: Bryan Mills Reviewed-by: Bryan Mills Reviewed-by: David Chase Auto-Submit: Bryan Mills --- src/cmd/go/internal/modcmd/vendor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/go/internal/modcmd/vendor.go b/src/cmd/go/internal/modcmd/vendor.go index 2bb2eb8090..78f0e59b8b 100644 --- a/src/cmd/go/internal/modcmd/vendor.go +++ b/src/cmd/go/internal/modcmd/vendor.go @@ -211,7 +211,7 @@ func moduleLine(m, r module.Version) string { b.WriteString(m.Version) } if r.Path != "" { - if strings.HasPrefix(r.Path, "./vendor") || strings.HasPrefix(r.Path, ".\vendor") { + if str.HasFilePathPrefix(filepath.Clean(r.Path), "vendor") { base.Fatalf("go: replacement path %s inside vendor directory", r.Path) } b.WriteString(" => ") -- 2.50.0