From: wangjianwen Date: Tue, 11 Apr 2023 02:44:55 +0000 (+0000) Subject: cmd/dist: check for errors from filepath.Glob X-Git-Tag: go1.21rc1~935 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4b154e55baced13a792ebd6a3796b31f49938a71;p=gostls13.git cmd/dist: check for errors from filepath.Glob Change-Id: Ib5bcd3d1e9618d65b4d4b0895d0e40dbd76646c6 GitHub-Last-Rev: 174084ca6c67ff99a4b3628d213b2de198f74dd0 GitHub-Pull-Request: golang/go#59516 Reviewed-on: https://go-review.googlesource.com/c/go/+/483435 Run-TryBot: Ian Lance Taylor Reviewed-by: Dmitri Shuralyov Auto-Submit: Ian Lance Taylor Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot --- diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index a76c312709..6dbc9951a9 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -1452,7 +1452,10 @@ func cmdbootstrap() { bootstrapBuildTools() // Remember old content of $GOROOT/bin for comparison below. - oldBinFiles, _ := filepath.Glob(pathf("%s/bin/*", goroot)) + oldBinFiles, err := filepath.Glob(pathf("%s/bin/*", goroot)) + if err != nil { + fatalf("glob: %v", err) + } // For the main bootstrap, building for host os/arch. oldgoos = goos @@ -1592,7 +1595,11 @@ func cmdbootstrap() { // Check that there are no new files in $GOROOT/bin other than // go and gofmt and $GOOS_$GOARCH (target bin when cross-compiling). - binFiles, _ := filepath.Glob(pathf("%s/bin/*", goroot)) + binFiles, err := filepath.Glob(pathf("%s/bin/*", goroot)) + if err != nil { + fatalf("glob: %v", err) + } + ok := map[string]bool{} for _, f := range oldBinFiles { ok[f] = true