From: Dave Cheney <dave@cheney.net>
Date: Thu, 10 Sep 2015 05:50:47 +0000 (+1000)
Subject: cmd/go: use RawToken to parse remote package metadata
X-Git-Tag: go1.6beta1~1120
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=81a4bbffbf70edd3aaa401b38eb581ad94e2288f;p=gostls13.git

cmd/go: use RawToken to parse remote package metadata

CL 14315 broke the tests for parsing loosely formed remote package
metadata. Switch the parsing to use RawToken to recover the previous
behaviour that Token provided.

It could be argued that the parser should be stricter, but as remote
metadata has been readable with the parser for several years, it is
safer to change the parser to continue to accept the samples provided
in the test cases.

Change-Id: I2a3ba1757d3cff53b1a1c4386276955bb46cf8cd
Reviewed-on: https://go-review.googlesource.com/14482
Reviewed-by: Minux Ma <minux@golang.org>
Run-TryBot: Minux Ma <minux@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/go/discovery.go b/src/cmd/go/discovery.go
index b9f4279954..4d1df2f472 100644
--- a/src/cmd/go/discovery.go
+++ b/src/cmd/go/discovery.go
@@ -41,7 +41,7 @@ func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) {
 	d.Strict = false
 	var t xml.Token
 	for {
-		t, err = d.Token()
+		t, err = d.RawToken()
 		if err != nil {
 			if err == io.EOF {
 				err = nil