mirror of
https://github.com/golang/go
synced 2024-11-23 06:50:05 -07:00
cmd/go: print a "found" line for each package found instead of each module added
We currently print a "go: finding" line for each missing package during import resolution. However, we are only printing a "go: found" line for each module: if a given module provides multiple packages, we don't indicate the module that we found for the second and later packages. Before this change: $ GO111MODULE=on go get golang.org/x/tools/cmd/html2article@78f9822548c13e2c41cc8039d1492a111240db07 go: found golang.org/x/tools/cmd/html2article in golang.org/x/tools v0.0.0-20190214195451-78f9822548c1 go: finding module for package golang.org/x/net/html go: finding module for package golang.org/x/net/html/atom go: downloading golang.org/x/net v0.0.0-20200202094626-16171245cfb2 go: found golang.org/x/net/html in golang.org/x/net v0.0.0-20200202094626-16171245cfb2 After: $ GO111MODULE=on go get golang.org/x/tools/cmd/html2article@78f9822548c13e2c41cc8039d1492a111240db07 go: found golang.org/x/tools/cmd/html2article in golang.org/x/tools v0.0.0-20190214195451-78f9822548c1 go: finding module for package golang.org/x/net/html/atom go: finding module for package golang.org/x/net/html go: found golang.org/x/net/html in golang.org/x/net v0.0.0-20200202094626-16171245cfb2 go: found golang.org/x/net/html/atom in golang.org/x/net v0.0.0-20200202094626-16171245cfb2 Updates #26152 Updates #33284 Change-Id: I221548749e36bfd6a79efe5edc3645dc5319fd6f Reviewed-on: https://go-review.googlesource.com/c/go/+/219437 Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com> Reviewed-by: Michael Matloob <matloob@golang.org>
This commit is contained in:
parent
bcdd5d0024
commit
13d73b2a8a
@ -655,13 +655,13 @@ func (ld *loader) load(roots func() []string) {
|
|||||||
if err.newMissingVersion != "" {
|
if err.newMissingVersion != "" {
|
||||||
base.Fatalf("go: %s: package provided by %s at latest version %s but not at required version %s", pkg.stackText(), err.Module.Path, err.Module.Version, err.newMissingVersion)
|
base.Fatalf("go: %s: package provided by %s at latest version %s but not at required version %s", pkg.stackText(), err.Module.Path, err.Module.Version, err.newMissingVersion)
|
||||||
}
|
}
|
||||||
|
fmt.Fprintf(os.Stderr, "go: found %s in %s %s\n", pkg.path, err.Module.Path, err.Module.Version)
|
||||||
if added[pkg.path] {
|
if added[pkg.path] {
|
||||||
base.Fatalf("go: %s: looping trying to add package", pkg.stackText())
|
base.Fatalf("go: %s: looping trying to add package", pkg.stackText())
|
||||||
}
|
}
|
||||||
added[pkg.path] = true
|
added[pkg.path] = true
|
||||||
numAdded++
|
numAdded++
|
||||||
if !haveMod[err.Module] {
|
if !haveMod[err.Module] {
|
||||||
fmt.Fprintf(os.Stderr, "go: found %s in %s %s\n", pkg.path, err.Module.Path, err.Module.Version)
|
|
||||||
haveMod[err.Module] = true
|
haveMod[err.Module] = true
|
||||||
modAddedBy[err.Module] = pkg
|
modAddedBy[err.Module] = pkg
|
||||||
buildList = append(buildList, err.Module)
|
buildList = append(buildList, err.Module)
|
||||||
|
Loading…
Reference in New Issue
Block a user