summaryrefslogtreecommitdiff
path: root/src/shared/condition.c
diff options
context:
space:
mode:
authorjiangchuangang <jiangchuangang@huawei.com>2021-11-29 22:30:37 +0800
committerjiangchuangang <jiangchuangang@huawei.com>2021-11-30 09:16:15 +0800
commit193105f2d0408e2d96265935174b3cf0f100ef2e (patch)
tree5784e72f5950549a827923ade7f37ac1864467e9 /src/shared/condition.c
parent8fb444011ef4017a441b707ab00ccddf30b465a6 (diff)
downloadsystemd-193105f2d0408e2d96265935174b3cf0f100ef2e.tar.gz
fix ConditionDirectoryNotEmpty when it comes to a Non-directory file
Diffstat (limited to 'src/shared/condition.c')
-rw-r--r--src/shared/condition.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 6e769e9d59..a86f2b9ffb 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) {