cmd/buildlet: fix removeAllIncludingReadonly on Plan 9
On Plan 9, files cannot be removed from read-only
directories.
The directories should be make writeable before
being able to remove files.
Also fixes a typo in comment.
Fixes golang/go#35634.
Change-Id: I2d810543c339e595da033e790025021e0d575b5e
Reviewed-on: https://go-review.googlesource.com/c/build/+/207283
Reviewed-by: Richard Miller <millerresearch@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/cmd/buildlet/buildlet.go b/cmd/buildlet/buildlet.go
index ae10490..707ca08 100644
--- a/cmd/buildlet/buildlet.go
+++ b/cmd/buildlet/buildlet.go
@@ -1813,8 +1813,7 @@
func removeAllIncludingReadonly(dir string) error {
err := os.RemoveAll(dir)
if err == nil || !os.IsPermission(err) ||
- runtime.GOOS == "windows" || // different filesystem permission model; also our windows builders our emphermal single-use VMs anyway
- runtime.GOOS == "plan9" { // untested, different enough to conservatively skip code below
+ runtime.GOOS == "windows" { // different filesystem permission model; also our windows builders are ephemeral single-use VMs anyway
return err
}
// Make a best effort (ignoring errors) attempt to make all
