diff options
| author | Russ Cox <rsc@golang.org> | 2023-05-23 10:29:47 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2023-05-23 19:01:38 +0000 |
| commit | 8366497625d308aa9b0bc022ad1efd2a5d45bb32 (patch) | |
| tree | 8e5d202af8dc4698b89cab23abe03d3c5be84067 /src/cmd/go/internal/load/pkg.go | |
| parent | ef23bd11a813176fe5fdd2c0fd19031ea3492b9b (diff) | |
| download | go-8366497625d308aa9b0bc022ad1efd2a5d45bb32.tar.gz go-8366497625d308aa9b0bc022ad1efd2a5d45bb32.zip | |
cmd/go: convert semver.IsValid to gover.ModIsValid
Change-Id: Id584c4bd6d1c12fd085414188bc7e7ca08164c04
Reviewed-on: https://go-review.googlesource.com/c/go/+/497416
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/cmd/go/internal/load/pkg.go')
| -rw-r--r-- | src/cmd/go/internal/load/pkg.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go index 4ae2444927..2056b95558 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -3231,9 +3231,10 @@ func PackagesAndErrorsOutsideModule(ctx context.Context, opts PackageOpts, args // Check that the arguments satisfy syntactic constraints. var version string + var firstPath string for _, arg := range args { if i := strings.Index(arg, "@"); i >= 0 { - version = arg[i+1:] + firstPath, version = arg[:i], arg[i+1:] if version == "" { return nil, fmt.Errorf("%s: version must not be empty", arg) } @@ -3271,7 +3272,7 @@ func PackagesAndErrorsOutsideModule(ctx context.Context, opts PackageOpts, args // later arguments, and other modules would. Let's not try to be too // magical though. allowed := modload.CheckAllowed - if modload.IsRevisionQuery(version) { + if modload.IsRevisionQuery(firstPath, version) { // Don't check for retractions if a specific revision is requested. allowed = nil } |