diff options
| author | Bryan C. Mills <bcmills@google.com> | 2021-02-22 17:05:32 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2021-03-10 21:00:52 +0000 |
| commit | 2ceb79db526eabff880a8a03caab07258883b216 (patch) | |
| tree | 576e9a8553b73a555398d9f5aba39b6a69d63ff6 /src/cmd/go/internal/modget/get.go | |
| parent | b7f0fb6d9eb9a2c1b2beb9ecd58bdbf3571dd5cd (diff) | |
| download | go-2ceb79db526eabff880a8a03caab07258883b216.tar.gz go-2ceb79db526eabff880a8a03caab07258883b216.zip | |
cmd/go/internal/modload: make EditBuildList report whether the build list was changed
For #36460
Change-Id: I8dd6e6f998a217a4287212815ce61209df6f007f
Reviewed-on: https://go-review.googlesource.com/c/go/+/296609
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/modget/get.go')
| -rw-r--r-- | src/cmd/go/internal/modget/get.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/go/internal/modget/get.go b/src/cmd/go/internal/modget/get.go index 9340a582e5..6b416d3622 100644 --- a/src/cmd/go/internal/modget/get.go +++ b/src/cmd/go/internal/modget/get.go @@ -30,7 +30,6 @@ import ( "fmt" "os" "path/filepath" - "reflect" "runtime" "sort" "strings" @@ -1635,7 +1634,8 @@ func (r *resolver) updateBuildList(ctx context.Context, additions []module.Versi } } - if err := modload.EditBuildList(ctx, additions, resolved); err != nil { + changed, err := modload.EditBuildList(ctx, additions, resolved) + if err != nil { var constraint *modload.ConstraintError if !errors.As(err, &constraint) { base.Errorf("go get: %v", err) @@ -1654,12 +1654,11 @@ func (r *resolver) updateBuildList(ctx context.Context, additions []module.Versi } return false } - - buildList := modload.LoadAllModules(ctx) - if reflect.DeepEqual(r.buildList, buildList) { + if !changed { return false } - r.buildList = buildList + + r.buildList = modload.LoadAllModules(ctx) r.buildListVersion = make(map[string]string, len(r.buildList)) for _, m := range r.buildList { r.buildListVersion[m.Path] = m.Version |