Commit b8d67596 authored by Russ Cox's avatar Russ Cox

cmd/go: adjust error for custom import checkout mismatch

Before:

	...
	imports golang.org/x/net/context: /Users/rsc/g/src/golang.org/x/net is from https://code.google.com/p/go.net, should be from https://go.googlesource.com/net

After:

	...
	imports golang.org/x/net/context: golang.org/x/net is a custom import path for https://go.googlesource.com/net, but /Users/rsc/g/src/golang.org/x/net is checked out from https://code.google.com/p/go.net

Change-Id: I93c35b85f955c7de684f71fbd4baecc717405318
Reviewed-on: https://go-review.googlesource.com/2808Reviewed-by: default avatarAndrew Gerrand <adg@golang.org>
Reviewed-by: default avatarRob Pike <r@golang.org>
parent 318947c6
...@@ -290,7 +290,7 @@ func downloadPackage(p *Package) error { ...@@ -290,7 +290,7 @@ func downloadPackage(p *Package) error {
} }
} }
if remote != repo { if remote != repo {
return fmt.Errorf("%s is from %s, should be from %s", dir, remote, repo) return fmt.Errorf("%s is a custom import path for %s, but %s is checked out from %s", rr.root, repo, dir, remote)
} }
} }
} }
......
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