From d3bf024f1a7de82361999c6fd130d3f37283600f Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 15 Mar 2023 19:38:19 +0800 Subject: [PATCH] edit-util: log unexpected errors if we fail to remove the parent dir --- src/shared/edit-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); -- 2.47.3