diff options
| author | Robert Daniel Kortschak <dan.kortschak@adelaide.edu.au> | 2013-09-11 10:50:56 +1000 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2013-09-11 10:50:56 +1000 |
| commit | b34ec90e1945af8ed22bf96254deb4c637c0bfbc (patch) | |
| tree | d48bbee9bec09e8d7ce70160944342d5ea705b63 /src | |
| parent | b99fdb2a11ae58834a2c0c646f54d0a587dd269c (diff) | |
| download | go-b34ec90e1945af8ed22bf96254deb4c637c0bfbc.tar.xz | |
cmd/api: make api check directory per-user
Fixes #6353.
R=golang-dev, bradfitz, alex.brainman
CC=golang-dev
https://golang.org/cl/13652043
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/api/run.go | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/cmd/api/run.go b/src/cmd/api/run.go index 067be4eb05..9ecd03a607 100644 --- a/src/cmd/api/run.go +++ b/src/cmd/api/run.go @@ -19,6 +19,7 @@ import ( "net/http" "os" "os/exec" + "os/user" "path/filepath" "strconv" "strings" @@ -99,8 +100,13 @@ func forceAPICheck() bool { func prepGoPath() string { const tempBase = "go.tools.TMP" + u, err := user.Current() + if err != nil { + log.Fatalf("Error getting current user: %v", err) + } + // The GOPATH we'll return - gopath := filepath.Join(os.TempDir(), "gopath-api", goToolsVersion) + gopath := filepath.Join(os.TempDir(), "gopath-api-"+cleanUsername(u.Username), goToolsVersion) // cloneDir is where we run "hg clone". cloneDir := filepath.Join(gopath, "src", "code.google.com", "p") @@ -140,6 +146,18 @@ func prepGoPath() string { return gopath } +func cleanUsername(n string) string { + b := make([]rune, len(n)) + for i, r := range n { + if r == '\\' || r == '/' || r == ':' { + b[i] = '_' + } else { + b[i] = r + } + } + return string(b) +} + func goToolsCheckoutGood(dir string) bool { if _, err := os.Stat(dir); err != nil { return false |