From: jiangchuangang <jiangchuangang@huawei.com>
Date: Mon, 29 Nov 2021 14:30:37 +0000 (+0800)
Subject: fix ConditionDirectoryNotEmpty when it comes to a Non-directory file
X-Git-Tag: v250-rc1~113^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=193105f2d0408e2d96265935174b3cf0f100ef2e;p=thirdparty%2Fsystemd.git

fix ConditionDirectoryNotEmpty when it comes to a Non-directory file
---

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 6e769e9d59b..a86f2b9ffbe 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -931,7 +931,7 @@ static int condition_test_directory_not_empty(Condition *c, char **env) {
         assert(c->type == CONDITION_DIRECTORY_NOT_EMPTY);
 
         r = dir_is_empty(c->parameter);
-        return r <= 0 && r != -ENOENT;
+        return r <= 0 && !IN_SET(r, -ENOENT, -ENOTDIR);
 }
 
 static int condition_test_file_not_empty(Condition *c, char **env) {