cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-17 13:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/go: do not print "go install" in errors from other commands

Browse Source 
Fixes #20251.

Change-Id: I312a9534248668c8b3b4cf979591ed1a49e509e1
Reviewed-on: https://go-review.googlesource.com/75474
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Russ Cox 2017-11-02 09:46:13 -04:00
parent f2503e612a
commit 2ff3e9c8d8
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/go/internal/cfg/cfg.go
View File

@ -38,6 +38,8 @@ var (
BuildWork bool // -work flag
BuildX bool // -x flag
CmdName string // "build", "install", "list", etc.
DebugActiongraph string // -debug-actiongraph flag (undocumented, unstable)
)

10
src/cmd/go/internal/work/build.go
View File

@ -550,14 +550,14 @@ func InstallPackages(args []string, forGet bool) {
if p.Target == "" && (!p.Standard || p.ImportPath != "unsafe") {
switch {
case p.Internal.GobinSubdir:
base.Errorf("go install: cannot install cross-compiled binaries when GOBIN is set")
base.Errorf("go %s: cannot install cross-compiled binaries when GOBIN is set", cfg.CmdName)
case p.Internal.Cmdline:
base.Errorf("go install: no install location for .go files listed on command line (GOBIN not set)")
base.Errorf("go %s: no install location for .go files listed on command line (GOBIN not set)", cfg.CmdName)
case p.ConflictDir != "":
base.Errorf("go install: no install location for %s: hidden by %s", p.Dir, p.ConflictDir)
base.Errorf("go %s: no install location for %s: hidden by %s", cfg.CmdName, p.Dir, p.ConflictDir)
default:
base.Errorf("go install: no install location for directory %s outside GOPATH\n"+
"\tFor more details see: 'go help gopath'", p.Dir)
base.Errorf("go %s: no install location for directory %s outside GOPATH\n"+
"\tFor more details see: 'go help gopath'", cfg.CmdName, p.Dir)
}
}
}

2
src/cmd/go/internal/work/exec.go
View File

@ -945,7 +945,7 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) {
if a.Package != nil {
sep, path = " ", a.Package.ImportPath
}
err = fmt.Errorf("go install%s%s: %v", sep, path, err)
err = fmt.Errorf("go %s%s%s: %v", cfg.CmdName, sep, path, err)
}
}()

1
src/cmd/go/main.go
View File

@ -77,6 +77,7 @@ func main() {
base.Usage()
}
cfg.CmdName = args[0] // for error messages
if args[0] == "help" {
help.Help(args[1:])
return