diff options
| author | Bryan C. Mills <bcmills@google.com> | 2020-10-30 12:24:51 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-11-05 16:46:56 +0000 |
| commit | 04b5b4f740a34a95a10253a0e34779bb259ec9c4 (patch) | |
| tree | db270568beafe25756252ba20239e5189b23a757 /src/cmd/go/internal/modload/import.go | |
| parent | 40f0359d52e04ed124a8f81e1ef8ac86957dd983 (diff) | |
| download | go-04b5b4f740a34a95a10253a0e34779bb259ec9c4.tar.gz go-04b5b4f740a34a95a10253a0e34779bb259ec9c4.zip | |
cmd/go/internal/modload: return a module-only result from QueryPattern
This allows a single QueryPattern call to resolve a path that could be
either a package or a module. It is important to be able to make a
single QueryPattern call — rather than a QueryPattern followed by a
Query for the specific module path — to provide appropriate fallback
behavior: if the proxy returns package results but does not contain a
module result, we don't want to fall back to the next proxy to look
for the (probably-nonexistent) module.
For #37438
Change-Id: I419b8bb3ab4565f443bb5cee9a8b206f453b9801
Reviewed-on: https://go-review.googlesource.com/c/go/+/266657
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/import.go')
| -rw-r--r-- | src/cmd/go/internal/modload/import.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go index e959347020..193edfdd20 100644 --- a/src/cmd/go/internal/modload/import.go +++ b/src/cmd/go/internal/modload/import.go @@ -383,7 +383,7 @@ func queryImport(ctx context.Context, path string) (module.Version, error) { // and return m, dir, ImpportMissingError. fmt.Fprintf(os.Stderr, "go: finding module for package %s\n", path) - candidates, err := QueryPattern(ctx, path, "latest", Selected, CheckAllowed) + candidates, err := QueryPackages(ctx, path, "latest", Selected, CheckAllowed) if err != nil { if errors.Is(err, fs.ErrNotExist) { // Return "cannot find module providing package […]" instead of whatever |