picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

basic/path-util: fix ordering in error message 

Jun 11 14:29:12 krowka systemd[1]: /etc/systemd/system/workingdir.service:6: = path is not normalizedWorkingDirectory: /../../etc
   ↓
Jun 11 14:32:12 krowka systemd[1]: /etc/systemd/system/workingdir.service:6: WorkingDirectory= path is not normalized: /../../etc
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-06-11 14:37:36 +02:00 committed by Lennart Poettering
parent bbac65bcc2
commit 86ab333d00
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/path-util.c
View File

@ -1014,14 +1014,14 @@ int path_simplify_and_warn(
if (!absolute && (flag & PATH_CHECK_ABSOLUTE)) {
log_syntax(unit, LOG_ERR, filename, line, 0,
"%s= path is not absolute%s: %s",
fatal ? "" : ", ignoring", lvalue, path);
lvalue, fatal ? "" : ", ignoring", path);
return -EINVAL;
}
if (absolute && (flag & PATH_CHECK_RELATIVE)) {
log_syntax(unit, LOG_ERR, filename, line, 0,
"%s= path is absolute%s: %s",
fatal ? "" : ", ignoring", lvalue, path);
lvalue, fatal ? "" : ", ignoring", path);
return -EINVAL;
}
}
@ -1031,7 +1031,7 @@ int path_simplify_and_warn(
if (!path_is_normalized(path)) {
log_syntax(unit, LOG_ERR, filename, line, 0,
"%s= path is not normalized%s: %s",
fatal ? "" : ", ignoring", lvalue, path);
lvalue, fatal ? "" : ", ignoring", path);
return -EINVAL;
}