]> Cypherpunks repositories - gostls13.git/commit
cmd/go: with -mod=vendor, don't panic if there are duplicate requirements
authorJay Conrod <jayconrod@google.com>
Thu, 5 Aug 2021 22:18:42 +0000 (15:18 -0700)
committerJay Conrod <jayconrod@google.com>
Mon, 9 Aug 2021 20:06:35 +0000 (20:06 +0000)
commitf1dce319ffd9d3663f522141abfb9c1ec9d92e04
tree057860fa3004ea4556261a2afa213b16de24fa49
parent7aeaad5c86174f61b084d72d89fb02d7fc64391c
cmd/go: with -mod=vendor, don't panic if there are duplicate requirements

In loadModFile with -mod=vendor, load the vendor list and use it to
initialize the module graph before calling updateRoots.

In updateLazyRoots with any mode other than "mod", return the original
*Requirements if no roots needed to be upgraded, even if there are
inconsistencies. This means 'go list -m -mod=readonly' and -mod=vendor
may succeed if there are duplicate requirements or requirements on
versions of the main module.

Fixes #47565

Change-Id: I4640dffc4a7359367cc910da0d29e3538bfd1ca4
Reviewed-on: https://go-review.googlesource.com/c/go/+/340252
Trust: Jay Conrod <jayconrod@google.com>
Trust: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
src/cmd/go/internal/modload/buildlist.go
src/cmd/go/internal/modload/init.go
src/cmd/go/testdata/script/mod_tidy_lazy_self.txt
src/cmd/go/testdata/script/mod_vendor_redundant_requirement.txt [new file with mode: 0644]