fix ConditionDirectoryNotEmpty when it comes to a Non-directory file

jcg190701 · jcg190701 · commit 193105f2d040 · 2021-11-30T09:16:15.000+08:00
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ static int condition_test_directory_not_empty(Condition c, char *env) {`
`931`	`931`	`assert(c->type == CONDITION_DIRECTORY_NOT_EMPTY);`
`932`	`932`
`933`	`933`	`r = dir_is_empty(c->parameter);`
`934`		`- return r <= 0 && r != -ENOENT;`
	`934`	`+ return r <= 0 && !IN_SET(r, -ENOENT, -ENOTDIR);`
`935`	`935`	`}`
`936`	`936`
`937`	`937`	`static int condition_test_file_not_empty(Condition c, char *env) {`