aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modcmd/vendor.go
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-10-24 05:05:15 +0000
committerBryan C. Mills <bcmills@google.com>2018-10-24 21:23:54 +0000
commit0e40889796a1dc9e2393bf4d66997da68692e970 (patch)
tree2464be4081e0553100ea5a6bd1bb68e176e1980c /src/cmd/go/internal/modcmd/vendor.go
parent7989119d1765955319141003ae21c8ff36f80bfb (diff)
downloadgo-0e40889796a1dc9e2393bf4d66997da68692e970.tar.gz
go-0e40889796a1dc9e2393bf4d66997da68692e970.zip
cmd/go: fix command name in error messages
`go vendor` is now `go mod vendor`. So it should be unified to use `go mod vendor` in error messages. Change-Id: I9e84b9a4f4500659b183b83040867b12a8d174aa GitHub-Last-Rev: 8516e246d4e7f70bf21311b4cb8cb571a561815b GitHub-Pull-Request: golang/go#28347 Reviewed-on: https://go-review.googlesource.com/c/144379 Reviewed-by: Bryan C. Mills <bcmills@google.com> Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/go/internal/modcmd/vendor.go')
-rw-r--r--src/cmd/go/internal/modcmd/vendor.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cmd/go/internal/modcmd/vendor.go b/src/cmd/go/internal/modcmd/vendor.go
index 62e7458535..7bd1d0b571 100644
--- a/src/cmd/go/internal/modcmd/vendor.go
+++ b/src/cmd/go/internal/modcmd/vendor.go
@@ -45,7 +45,7 @@ func runVendor(cmd *base.Command, args []string) {
vdir := filepath.Join(modload.ModRoot, "vendor")
if err := os.RemoveAll(vdir); err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
modpkgs := make(map[module.Version][]string)
@@ -85,7 +85,7 @@ func runVendor(cmd *base.Command, args []string) {
return
}
if err := ioutil.WriteFile(filepath.Join(vdir, "modules.txt"), buf.Bytes(), 0666); err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
}
@@ -172,10 +172,10 @@ func matchNonTest(info os.FileInfo) bool {
func copyDir(dst, src string, match func(os.FileInfo) bool) {
files, err := ioutil.ReadDir(src)
if err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
if err := os.MkdirAll(dst, 0777); err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
for _, file := range files {
if file.IsDir() || !file.Mode().IsRegular() || !match(file) {
@@ -183,18 +183,18 @@ func copyDir(dst, src string, match func(os.FileInfo) bool) {
}
r, err := os.Open(filepath.Join(src, file.Name()))
if err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
w, err := os.Create(filepath.Join(dst, file.Name()))
if err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
if _, err := io.Copy(w, r); err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
r.Close()
if err := w.Close(); err != nil {
- base.Fatalf("go vendor: %v", err)
+ base.Fatalf("go mod vendor: %v", err)
}
}
}