diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-07-08 18:11:23 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-02-28 19:04:46 +0000 |
| commit | 156c60709e7775a6f1baa9685155b5974fefdea9 (patch) | |
| tree | 643dc8cf85c2d1aa0b29b1053ac37bea0b4e43dd /src/cmd/go/internal/get/get.go | |
| parent | d464c7ce29faa90ef2d35d5072c3e7c07606c525 (diff) | |
| download | go-156c60709e7775a6f1baa9685155b5974fefdea9.tar.gz go-156c60709e7775a6f1baa9685155b5974fefdea9.zip | |
cmd/go/internal/search: record errors in the Match struct
Previously, we would either invoke base.Fatalf (which is too aggressive),
or log.Print (which is too passive).
Updates #32917
Change-Id: I5475e873e76948de7df65dca08bc0ce67a7fc827
Reviewed-on: https://go-review.googlesource.com/c/go/+/185344
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/cmd/go/internal/get/get.go')
| -rw-r--r-- | src/cmd/go/internal/get/get.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cmd/go/internal/get/get.go b/src/cmd/go/internal/get/get.go index 500e3e0da6..90c5176b0b 100644 --- a/src/cmd/go/internal/get/get.go +++ b/src/cmd/go/internal/get/get.go @@ -285,10 +285,15 @@ func download(arg string, parent *load.Package, stk *load.ImportStack, mode int) // We delay this until after reloadPackage so that the old entry // for p has been replaced in the package cache. if wildcardOkay && strings.Contains(arg, "...") { + var match *search.Match if build.IsLocalImport(arg) { - args = search.MatchPackagesInFS(arg).Pkgs + match = search.MatchPackagesInFS(arg) } else { - args = search.MatchPackages(arg).Pkgs + match = search.MatchPackages(arg) + } + args = match.Pkgs + for _, err := range match.Errs { + base.Errorf("%s", err) } isWildcard = true } |