From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 15 Mar 2023 11:38:19 +0000 (+0800)
Subject: edit-util: log unexpected errors if we fail to remove the parent dir
X-Git-Tag: v254-rc1~1011^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F26831%2Fhead;p=thirdparty%2Fsystemd.git

edit-util: log unexpected errors if we fail to remove the parent dir
---

diff --git a/src/shared/edit-util.c b/src/shared/edit-util.c
index 195075ba975..58cd7fe9f3d 100644
--- a/src/shared/edit-util.c
+++ b/src/shared/edit-util.c
@@ -32,8 +32,8 @@ void edit_file_context_done(EditFileContext *context) {
                         r = path_extract_directory(i->path, &parent);
                         if (r < 0)
                                 log_debug_errno(r, "Failed to extract directory from '%s', ignoring: %m", i->path);
-                        else /* No need to check if the dir is empty, rmdir does nothing if it is not the case. */
-                            (void) rmdir(parent);
+                        else if (rmdir(parent) < 0 && !IN_SET(errno, ENOENT, ENOTEMPTY))
+                                log_debug_errno(errno, "Failed to remove parent directory '%s', ignoring: %m", parent);
                 }
 
                 free(i->path);