Don't fail cleanup when a file has turned into a directory

If .ninja_log contains an entry that used to be a file but is now a
non-empty directory the os.Remove call will fail.  Silently ignore
this error, if the files in the directory are abandoned the directory
will be cleaned up when the files are removed.

1 files changed, 5 insertions, 0 deletions

diff --git a/bootstrap/cleanup.go b/bootstrap/cleanup.go
index 7029111..f7b1cf9 100644
--- a/bootstrap/cleanup.go
+++ b/bootstrap/cleanup.go
@@ -124,6 +124,11 @@ func removeFileAndEmptyDirs(path string) error {
 		if os.IsNotExist(err) {
 			return nil
 		}
+		pathErr := err.(*os.PathError)
+		switch pathErr.Err {
+		case syscall.ENOTEMPTY, syscall.EEXIST:
+			return nil
+		}
 		return err
 	}