summaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modfetch/codehost/codehost.go
diff options
context:
space:
mode:
authorAlexander Rakoczy <alex@golang.org>2020-12-14 11:42:42 -0500
committerAlexander Rakoczy <alex@golang.org>2020-12-14 11:42:42 -0500
commit267975dc4732b6f6a62a7d33a85de34efef180b7 (patch)
treefd69c51067a279d959b233b94bccf2bf969317a7 /src/cmd/go/internal/modfetch/codehost/codehost.go
parent63bc23b5452f6605df3e40ce7ecdd8b0348792af (diff)
parent6c64b6db6802818dd9a4789cdd564f19b70b6b4c (diff)
downloadgo-git-267975dc4732b6f6a62a7d33a85de34efef180b7.tar.gz
Merge branch 'master' into dev.regabi
Change-Id: I098acdbc5e2676aeb8700d935e796a9c29d04b88
Diffstat (limited to 'src/cmd/go/internal/modfetch/codehost/codehost.go')
-rw-r--r--src/cmd/go/internal/modfetch/codehost/codehost.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cmd/go/internal/modfetch/codehost/codehost.go b/src/cmd/go/internal/modfetch/codehost/codehost.go
index 286d3f7220..86c1c14d4a 100644
--- a/src/cmd/go/internal/modfetch/codehost/codehost.go
+++ b/src/cmd/go/internal/modfetch/codehost/codehost.go
@@ -12,7 +12,6 @@ import (
"fmt"
"io"
"io/fs"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -189,7 +188,7 @@ func WorkDir(typ, name string) (dir, lockfile string, err error) {
}
defer unlock()
- data, err := ioutil.ReadFile(dir + ".info")
+ data, err := os.ReadFile(dir + ".info")
info, err2 := os.Stat(dir)
if err == nil && err2 == nil && info.IsDir() {
// Info file and directory both already exist: reuse.
@@ -211,7 +210,7 @@ func WorkDir(typ, name string) (dir, lockfile string, err error) {
if err := os.MkdirAll(dir, 0777); err != nil {
return "", "", err
}
- if err := ioutil.WriteFile(dir+".info", []byte(key), 0666); err != nil {
+ if err := os.WriteFile(dir+".info", []byte(key), 0666); err != nil {
os.RemoveAll(dir)
return "", "", err
}