commit 8255a2b0bb5a04e5ef361aad77531d77d996403b
author Sudheer Shanka <sudheersai@google.com> Mon Feb 25 12:21:23 2019 -0800
committer Sudheer Shanka <sudheersai@google.com> Mon Feb 25 12:21:23 2019 -0800
tree e34170960dac5caf1156faeaaa8c1b5b09f4db58
parent 30df1c61d954273ca437e0f8a1b6fd22d6d796a8

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

Fixes: 126208830
Test: manual
Change-Id: I34788ebb2dd42e62ee3061f7d81dc03047048c3b

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 6e0fe21..45183ed 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -902,7 +902,7 @@
     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;
     }