From 5b085482ae8792cf751371991488d29e7bd3762f Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 18 Dec 2015 14:30:12 -0500 Subject: [PATCH] cmd/go: ignore XML errors after Go tags Fixes #13683. Change-Id: I26afb3ac346beb95624f9032d94a29b5bc7853ef Reviewed-on: https://go-review.googlesource.com/18051 Reviewed-by: Brad Fitzpatrick --- src/cmd/go/discovery.go | 2 +- src/cmd/go/pkg_test.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cmd/go/discovery.go b/src/cmd/go/discovery.go index 4d1df2f472..f6992e9e93 100644 --- a/src/cmd/go/discovery.go +++ b/src/cmd/go/discovery.go @@ -43,7 +43,7 @@ func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) { for { t, err = d.RawToken() if err != nil { - if err == io.EOF { + if err == io.EOF || len(imports) > 0 { err = nil } return diff --git a/src/cmd/go/pkg_test.go b/src/cmd/go/pkg_test.go index 23c2e08da1..90a92582e7 100644 --- a/src/cmd/go/pkg_test.go +++ b/src/cmd/go/pkg_test.go @@ -57,6 +57,15 @@ var parseMetaGoImportsTests = []struct { `, []metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}}, }, + { + ``, + []metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}}, + }, + { + // XML doesn't like
. + `Page Not Found
DRAFT
`, + []metaImport{{"chitin.io/chitin", "git", "https://github.com/chitin-io/chitin"}}, + }, } func TestParseMetaGoImports(t *testing.T) { -- 2.50.0