diff options
| author | Jay Conrod <jayconrod@google.com> | 2019-08-06 12:44:30 -0400 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2019-08-06 23:05:55 +0000 |
| commit | e37a1b1ca6afcbe3b02d2dfd599ad1d3d926ec34 (patch) | |
| tree | 12a89f90d95122135803b6bd06a970bbbacf3057 /src/cmd/go/internal/load/pkg.go | |
| parent | 0ed86cda677f04a9ca01498dfa9722f234f984d2 (diff) | |
| download | go-e37a1b1ca6afcbe3b02d2dfd599ad1d3d926ec34.tar.gz go-e37a1b1ca6afcbe3b02d2dfd599ad1d3d926ec34.zip | |
cmd/go: improve error message for missing import starting with cmd/
In modload.Import, confirm that the import path does not start with
"cmd/" before calling QueryPackage, which returns a less helpful
error.
In load.loadPackageData, don't wrap errors with "unknown import path".
The wrapped error should always include the import path, and it's also
repeated in the PackageError wrapper.
Fixes #31031
Change-Id: I071efa22e3842c62831d096f888a8006811fe724
Reviewed-on: https://go-review.googlesource.com/c/go/+/189157
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/load/pkg.go')
| -rw-r--r-- | src/cmd/go/internal/load/pkg.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go index d52df046ff..27efc7c04a 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -653,7 +653,7 @@ func loadPackageData(path, parentPath, parentDir, parentRoot string, parentIsStd } } else if r.err != nil { data.p = new(build.Package) - data.err = fmt.Errorf("unknown import path %q: %v", r.path, r.err) + data.err = r.err } else if cfg.ModulesEnabled && path != "unsafe" { data.p = new(build.Package) data.err = fmt.Errorf("unknown import path %q: internal error: module loader did not resolve import", r.path) |