(remove_parents): Use the correct test

(same as in main) in handling --ignore-fail-on-non-empty.
From Michael Stone.

diff --git a/src/rmdir.c b/src/rmdir.c
index 01727b8b4d247013346c750c584a31651328f27b..24c5f66e338a8262b0566631cf68ee1e3784b88c 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -101,11 +101,15 @@ remove_parents (char *path)
 
       if (fail)
        {
-         /* Give a diagnostic and set fail if not --ignore.  */
-         if (!ignore_fail_on_non_empty || errno != ENOTEMPTY)
+         /* Stop quietly if --ignore-fail-on-non-empty. */
+         if (ignore_fail_on_non_empty
+             && (errno == ENOTEMPTY || errno == EEXIST))
+           {
+             fail = 0;
+           }
+         else
            {
              error (0, errno, "%s", path);
-             fail = 1;
            }
          break;
        }