diff options
| author | Russ Cox <rsc@golang.org> | 2015-01-14 01:23:26 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-01-14 20:30:19 +0000 |
| commit | 7df87f50660bf51edd88c44cc294c32d39088639 (patch) | |
| tree | 776fca960108907167f5db9d4b19724a0f4f663e | |
| parent | 97b84fc4c86936ac0b012a7f091f70b1f791c11c (diff) | |
| download | go-7df87f50660bf51edd88c44cc294c32d39088639.tar.gz go-7df87f50660bf51edd88c44cc294c32d39088639.zip | |
[release-branch.go1.4] 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/2808
Reviewed-by: Andrew Gerrand <adg@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
(cherry picked from commit b8d67596f67ea13525e752a02f45c9d9f346472d)
Reviewed-on: https://go-review.googlesource.com/2813
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
| -rw-r--r-- | src/cmd/go/get.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/get.go b/src/cmd/go/get.go index 86e1697618..50e0ca93bf 100644 --- a/src/cmd/go/get.go +++ b/src/cmd/go/get.go @@ -290,7 +290,7 @@ func downloadPackage(p *Package) error { } } 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) } } } |