commit a9ca319cc3dc47fadcfa1ddc225471d9da023fa2
author Sudheer Shanka <sudheersai@google.com> Tue Feb 26 16:18:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 26 16:18:15 2019 +0000
tree 932b7cb0dd09aa954ba05cfa0c7ba79f43e0b6bb
parent cdd5a2feb7066718fa284014f5f86e71532369ef
parent 83680408415595dbda9f1126b1f38beef29bf200

Merge "Look for visible vols for a user under /mnt/user/<userId>/package/."

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;
     }