]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.4] cmd/go: adjust error for custom import checkout mismatch
authorRuss Cox <rsc@golang.org>
Wed, 14 Jan 2015 06:23:26 +0000 (01:23 -0500)
committerRuss Cox <rsc@golang.org>
Wed, 14 Jan 2015 20:30:19 +0000 (20:30 +0000)
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>
src/cmd/go/get.go

index 86e1697618ab4d6e21f8e5d78ef1d5b547abc2ac..50e0ca93bf42053466b83543c63cccf45bae90e4 100644 (file)
@@ -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)
                                        }
                                }
                        }