Projects
Mega:23.03
systemd
_service:tar_scm:backport-fix-ConditionDirector...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:backport-fix-ConditionDirectoryNotEmpty-when-it-comes-to-a-No.patch of Package systemd
From 10fc8b7775a8cfd9519a1c6628d813b1aa315a33 Mon Sep 17 00:00:00 2001 From: jiangchuangang <jiangchuangang@huawei.com> Date: Mon, 29 Nov 2021 22:30:37 +0800 Subject: [PATCH] fix ConditionDirectoryNotEmpty when it comes to a Non-directory file (cherry picked from commit 193105f2d0408e2d96265935174b3cf0f100ef2e) Conflict:NA Reference:https://github.com/systemd/systemd/commit/10fc8b7775a8cfd9519a1c6628d813b1aa315a33 --- src/shared/condition.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/condition.c b/src/shared/condition.c index ec9d57b292..163ddc1208 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -934,7 +934,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) { -- 2.33.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2