aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modcmd/vendor.go
diff options
context:
space:
mode:
authorMichael Matloob <matloob@golang.org>2020-10-30 17:11:36 -0400
committerMichael Matloob <matloob@golang.org>2020-11-20 18:29:46 +0000
commit676f0a45edd6b9be824f21530a13a695466880bf (patch)
tree60992647429c76300b91d7c9c0eb99b77ae76761 /src/cmd/go/internal/modcmd/vendor.go
parenta19c925eda6987d91f316639db2ce774725f7a1a (diff)
downloadgo-676f0a45edd6b9be824f21530a13a695466880bf.tar.gz
go-676f0a45edd6b9be824f21530a13a695466880bf.zip
cmd/go: support overlaying go.mod files
This change updates the lockedfile package to open files using the new fsys.OpenFile function. The logic of fsys.Open has been moved into fsys.OpenFile, and fsys.Open is now just a light wrapper around it. For #39958 Change-Id: I552f1a45ac00ac06b5812008d17a61e610b4b113 Reviewed-on: https://go-review.googlesource.com/c/go/+/266797 Trust: Michael Matloob <matloob@golang.org> Run-TryBot: Michael Matloob <matloob@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com> Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modcmd/vendor.go')
-rw-r--r--src/cmd/go/internal/modcmd/vendor.go3
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 4e73960e80..38c473d36b 100644
--- a/src/cmd/go/internal/modcmd/vendor.go
+++ b/src/cmd/go/internal/modcmd/vendor.go
@@ -18,6 +18,7 @@ import (
"cmd/go/internal/base"
"cmd/go/internal/cfg"
+ "cmd/go/internal/fsys"
"cmd/go/internal/imports"
"cmd/go/internal/modload"
@@ -259,7 +260,7 @@ func matchPotentialSourceFile(dir string, info fs.FileInfo) bool {
return false
}
if strings.HasSuffix(info.Name(), ".go") {
- f, err := os.Open(filepath.Join(dir, info.Name()))
+ f, err := fsys.Open(filepath.Join(dir, info.Name()))
if err != nil {
base.Fatalf("go mod vendor: %v", err)
}