mirror of
https://github.com/golang/go
synced 2024-09-30 09:28:33 -06:00
cmd/go/internal/modload: do not disable Query for -mod=readonly
'go list -m' allows explicit module@version arguments, which it resolves (using Query) but does not add to the build list. Similarly, 'go list -u' resolves versions without modifying the build list. These explicit operations should be allowed even when '-mod=readonly' is set. Updates #36478 'go list' and 'go mod download' do not Change-Id: I5d2735729ad573635b9c1902d5d3a8bd960b8a76 Reviewed-on: https://go-review.googlesource.com/c/go/+/214077 Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com>
This commit is contained in:
parent
957259b7e2
commit
cec535b7b7
@ -79,7 +79,7 @@ func queryProxy(proxy, path, query, current string, allowed func(module.Version)
|
|||||||
if current != "" && !semver.IsValid(current) {
|
if current != "" && !semver.IsValid(current) {
|
||||||
return nil, fmt.Errorf("invalid previous version %q", current)
|
return nil, fmt.Errorf("invalid previous version %q", current)
|
||||||
}
|
}
|
||||||
if cfg.BuildMod != "" && cfg.BuildMod != "mod" {
|
if cfg.BuildMod == "vendor" {
|
||||||
return nil, errQueryDisabled
|
return nil, errQueryDisabled
|
||||||
}
|
}
|
||||||
if allowed == nil {
|
if allowed == nil {
|
||||||
|
5
src/cmd/go/testdata/script/mod_readonly.txt
vendored
5
src/cmd/go/testdata/script/mod_readonly.txt
vendored
@ -34,6 +34,11 @@ go list all
|
|||||||
go clean -modcache
|
go clean -modcache
|
||||||
go list all
|
go list all
|
||||||
|
|
||||||
|
# -mod=readonly must not cause 'go list -m' to fail.
|
||||||
|
# (golang.org/issue/36478)
|
||||||
|
go list -m all
|
||||||
|
! stderr 'cannot query module'
|
||||||
|
|
||||||
# -mod=readonly should reject inconsistent go.mod files
|
# -mod=readonly should reject inconsistent go.mod files
|
||||||
# (ones that would be rewritten).
|
# (ones that would be rewritten).
|
||||||
go mod edit -require rsc.io/sampler@v1.2.0
|
go mod edit -require rsc.io/sampler@v1.2.0
|
||||||
|
Loading…
Reference in New Issue
Block a user