Commit 1e4b642f authored by Brad Fitzpatrick's avatar Brad Fitzpatrick

cmd/api: work around Windows rename issue on the builders

More cmd/api/run.go hell.

Fixes #9407

Change-Id: If8fb446a2471d6372beb0534c9ab6824029b404c
Reviewed-on: https://go-review.googlesource.com/2054Reviewed-by: 's avatarAlex Brainman <alex.brainman@gmail.com>
Reviewed-by: 's avatarMinux Ma <minux@golang.org>
parent e98f2179
......@@ -150,7 +150,19 @@ func prepGoPath() string {
}
if err := os.Rename(tmpDir, finalDir); err != nil {
log.Fatal(err)
if os.IsExist(err) {
// A different builder beat us into putting this repo into
// its final place. But that's fine; if it's there, it's
// the right version and we can use it.
//
// This happens on the Go project's Windows builders
// especially, where we have two builders (386 and amd64)
// running at the same time, trying to compete for moving
// it into place.
os.RemoveAll(tmpDir)
} else {
log.Fatal(err)
}
}
return gopath
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment