qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 20:40:03 -07:00
Code Releases Activity

cmd/go: fix go.mod file name printed in error messages for replacements

Browse Source 
This fixes a logic error introduced in CL 337850.

Fixes #47444

Change-Id: I6a49c8fc71fdde4ecb7f2e3329ad1f2cd286b7eb
Reviewed-on: https://go-review.googlesource.com/c/go/+/338189
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Trust: Jay Conrod <jayconrod@google.com>
This commit is contained in:
Jay Conrod 2021-07-28 11:52:14 -07:00
parent b39e0f461c
commit 9eee0ed439
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/go/internal/modload/modfile.go
View File

@ -652,8 +652,8 @@ func rawGoModData(m module.Version) (name string, data []byte, err error) {
if !filepath.IsAbs(dir) { if !filepath.IsAbs(dir) {
dir = filepath.Join(ModRoot(), dir) dir = filepath.Join(ModRoot(), dir)
} }
gomod := filepath.Join(dir, "go.mod") name = filepath.Join(dir, "go.mod")
if gomodActual, ok := fsys.OverlayPath(gomod); ok { if gomodActual, ok := fsys.OverlayPath(name); ok {
// Don't lock go.mod if it's part of the overlay. // Don't lock go.mod if it's part of the overlay.
// On Plan 9, locking requires chmod, and we don't want to modify any file // On Plan 9, locking requires chmod, and we don't want to modify any file
// in the overlay. See #44700. // in the overlay. See #44700.
@ -662,16 +662,17 @@ func rawGoModData(m module.Version) (name string, data []byte, err error) {
data, err = lockedfile.Read(gomodActual) data, err = lockedfile.Read(gomodActual)
} }
if err != nil { if err != nil {
return gomod, nil, module.VersionError(m, fmt.Errorf("reading %s: %v", base.ShortPath(gomod), err)) return "", nil, module.VersionError(m, fmt.Errorf("reading %s: %v", base.ShortPath(name), err))
} }
} else { } else {
if !semver.IsValid(m.Version) { if !semver.IsValid(m.Version) {
// Disallow the broader queries supported by fetch.Lookup. // Disallow the broader queries supported by fetch.Lookup.
base.Fatalf("go: internal error: %s@%s: unexpected invalid semantic version", m.Path, m.Version) base.Fatalf("go: internal error: %s@%s: unexpected invalid semantic version", m.Path, m.Version)
} }
name = "go.mod"
data, err = modfetch.GoMod(m.Path, m.Version) data, err = modfetch.GoMod(m.Path, m.Version)
} }
return "go.mod", data, err return name, data, err
} }
// queryLatestVersionIgnoringRetractions looks up the latest version of the // queryLatestVersionIgnoringRetractions looks up the latest version of the