Modified to use extracted MatchPrefixPatterns function.

witchard · witchard · commit e298c0009eb5 · 2020-08-30T19:13:50.000+01:00
diff --git a/src/cmd/go/internal/get/get.go b/src/cmd/go/internal/get/get.go
@@ -20,6 +20,8 @@ import (
 	"cmd/go/internal/str"
 	"cmd/go/internal/web"
 	"cmd/go/internal/work"
+
+	"golang.org/x/mod/module"
 )
 
 var CmdGet = &base.Command{
@@ -429,7 +431,7 @@ func downloadPackage(p *load.Package) error {
 		return fmt.Errorf("%s: invalid import path: %v", p.ImportPath, err)
 	}
 	security := web.SecureOnly
-	if Insecure || str.GlobsMatchPath(cfg.GOINSECURE, importPrefix) {
+	if Insecure || module.MatchPrefixPatterns(cfg.GOINSECURE, importPrefix) {
 		security = web.Insecure
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ import (`
`20`	`20`	`"cmd/go/internal/str"`
`21`	`21`	`"cmd/go/internal/web"`
`22`	`22`	`"cmd/go/internal/work"`
	`23`	`+`
	`24`	`+ "golang.org/x/mod/module"`
`23`	`25`	`)`
`24`	`26`
`25`	`27`	`var CmdGet = &base.Command{`
`@@ -429,7 +431,7 @@ func downloadPackage(p *load.Package) error {`
`429`	`431`	`return fmt.Errorf("%s: invalid import path: %v", p.ImportPath, err)`
`430`	`432`	`}`
`431`	`433`	`security := web.SecureOnly`
`432`		`- if Insecure \|\| str.GlobsMatchPath(cfg.GOINSECURE, importPrefix) {`
	`434`	`+ if Insecure \|\| module.MatchPrefixPatterns(cfg.GOINSECURE, importPrefix) {`
`433`	`435`	`security = web.Insecure`
`434`	`436`	`}`
`435`	`437`