| commit | ca3817145ced8eb2f0fa23d70ece03e48c076f21 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Nov 17 16:18:13 2015 -0800 |
| committer | Colin Cross <ccross@android.com> | Tue Nov 17 16:35:22 2015 -0800 |
| tree | 186428c56dfcb0e798e962c0fcb2f601a5f3820b | |
| parent | f5df83e7ee38c58a6b6bd78bb2940e4bb0e2e3e5 [diff] |
End removing directories on ENOTDIR An abandoned directory may have been replaced with a file, give up on removing the directory on ENOTDIR.
diff --git a/bootstrap/cleanup.go b/bootstrap/cleanup.go index 89c4b3e..3171272 100644 --- a/bootstrap/cleanup.go +++ b/bootstrap/cleanup.go
@@ -130,7 +130,7 @@ } pathErr := err.(*os.PathError) switch pathErr.Err { - case syscall.ENOTEMPTY, syscall.EEXIST: + case syscall.ENOTEMPTY, syscall.EEXIST, syscall.ENOTDIR: return nil } return err