diff options
| author | Filippo Valsorda <filippo@golang.org> | 2018-07-02 17:50:42 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2018-07-02 22:36:31 +0000 |
| commit | 0bad1bef406e987b7b749efc3bb7ab5d08b36a1c (patch) | |
| tree | 34b9f97d1683622d58605928e4d75fb4df711ae5 /src/cmd/go/internal/get/discovery.go | |
| parent | 3959ce667657defe1c99984adde93ca496953765 (diff) | |
| parent | 7df09b4a03f9e53334672674ba7983d5e7128646 (diff) | |
| download | go-0bad1bef406e987b7b749efc3bb7ab5d08b36a1c.tar.gz go-0bad1bef406e987b7b749efc3bb7ab5d08b36a1c.zip | |
[dev.boringcrypto.go1.9] all: merge go1.9.7 into dev.boringcrypto.go1.9dev.boringcrypto.go1.9
Change-Id: I1f9769a0c2c7c090886afa31c86c403da29d2013
Diffstat (limited to 'src/cmd/go/internal/get/discovery.go')
| -rw-r--r-- | src/cmd/go/internal/get/discovery.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/cmd/go/internal/get/discovery.go b/src/cmd/go/internal/get/discovery.go index b2918dbb4f..97aa1d7e8d 100644 --- a/src/cmd/go/internal/get/discovery.go +++ b/src/cmd/go/internal/get/discovery.go @@ -55,6 +55,13 @@ func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) { continue } if f := strings.Fields(attrValue(e.Attr, "content")); len(f) == 3 { + // Ignore VCS type "mod", which is new Go modules. + // This code is for old go get and must ignore the new mod lines. + // Otherwise matchGoImport will complain about two + // different metaImport lines for the same Prefix. + if f[1] == "mod" { + continue + } imports = append(imports, metaImport{ Prefix: f[0], VCS: f[1], |