Merge "Ignore if the dir we are trying remove doesn't exist."

5 years ago · cdd5a2feb7
parent db18995da8 8255a2b0bb
commit cdd5a2feb7
1 changed files with 1 additions and 1 deletions
--- a/Utils.cpp
+++ b/Utils.cpp
@ -902,7 +902,7 @@ status_t DeleteDirContentsAndDir(const std::string& pathname) {
    if (res < 0) {
        return res;
    }
-    if (rmdir(pathname.c_str()) != 0) {
+    if (TEMP_FAILURE_RETRY(rmdir(pathname.c_str())) < 0 && errno != ENOENT) {
        PLOG(ERROR) << "rmdir failed on " << pathname;
        return -errno;
    }