Commit 76a07833 authored by Andrew Gerrand's avatar Andrew Gerrand

goinstall: only suggest -fix for bad imports when appropriate

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5495073
parent 96a5780d
......@@ -367,6 +367,14 @@ func (v *vcs) findURL(root string) (string, error) {
var oldGoogleRepo = regexp.MustCompile(`^([a-z0-9\-]+)\.googlecode\.com/(svn|git|hg)(/[a-z0-9A-Z_.\-/]+)?$`)
type errOldGoogleRepo struct {
fixedPath string
}
func (e *errOldGoogleRepo) Error() string {
return fmt.Sprintf("unsupported import path; should be %q", e.fixedPath)
}
// download checks out or updates the specified package from the remote server.
func download(importPath, srcDir string) (public bool, err error) {
if strings.Contains(importPath, "..") {
......@@ -376,11 +384,7 @@ func download(importPath, srcDir string) (public bool, err error) {
if m := oldGoogleRepo.FindStringSubmatch(importPath); m != nil {
fixedPath := "code.google.com/p/" + m[1] + m[3]
err = fmt.Errorf(
"unsupported import path; should be %q\n"+
"Run goinstall with -fix to gofix the code.",
fixedPath,
)
err = &errOldGoogleRepo{fixedPath}
return
}
......
......@@ -249,6 +249,10 @@ func install(pkg, parent string) error {
printf("%s: download\n", pkg)
public, err = download(pkg, tree.SrcDir())
if err != nil {
// only suggest -fix if the bad import was not on the command line
if e, ok := err.(*errOldGoogleRepo); ok && parent != "" {
err = fmt.Errorf("%v\nRun goinstall with -fix to gofix the code.", e)
}
return &DownloadError{pkg, tree.Goroot, err}
}
} else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment