diff options
| author | Bryan C. Mills <bcmills@google.com> | 2020-10-30 22:13:51 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-11-05 16:47:45 +0000 |
| commit | a19a4dcb987d010b5ed0cecc4b377382f42a6ecc (patch) | |
| tree | e19d303ab203b57ff5f3fa1bd9448a00a5dcf3da /src/cmd/go/internal/mvs/mvs_test.go | |
| parent | 4a3339223c82b6d184d2fd990b996ed0b365653c (diff) | |
| download | go-a19a4dcb987d010b5ed0cecc4b377382f42a6ecc.tar.gz go-a19a4dcb987d010b5ed0cecc4b377382f42a6ecc.zip | |
cmd/go/internal/mvs: in Upgrade, pass upgrades to buildList as upgrades
This has no impact on the resulting build list, but provides clearer
diagnostics if reqs.Required returns an error for one of the upgraded
modules.
For #37438
Change-Id: I5cd8f72a9b7b9a0b185e1a728f46fefbd2f09b4a
Reviewed-on: https://go-review.googlesource.com/c/go/+/266897
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Diffstat (limited to 'src/cmd/go/internal/mvs/mvs_test.go')
| -rw-r--r-- | src/cmd/go/internal/mvs/mvs_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/internal/mvs/mvs_test.go b/src/cmd/go/internal/mvs/mvs_test.go index af1bb216a7..721cd9635c 100644 --- a/src/cmd/go/internal/mvs/mvs_test.go +++ b/src/cmd/go/internal/mvs/mvs_test.go @@ -491,9 +491,9 @@ func (r reqsMap) Max(v1, v2 string) string { } func (r reqsMap) Upgrade(m module.Version) (module.Version, error) { - var u module.Version + u := module.Version{Version: "none"} for k := range r { - if k.Path == m.Path && u.Version < k.Version && !strings.HasSuffix(k.Version, ".hidden") { + if k.Path == m.Path && r.Max(u.Version, k.Version) == k.Version && !strings.HasSuffix(k.Version, ".hidden") { u = k } } |