shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

systemctl: do not use -1 for return code

Browse Source 
Also make the error messages more specific to give a hint to the user
how to solve the problem.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-12-13 12:43:07 -05:00
parent 1a7f1b385c
commit 5b013a2f67
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/systemctl/systemctl.c
View File

@ -6106,19 +6106,15 @@ static int find_paths_to_edit(sd_bus *bus, char **names, char ***paths) {
if (arg_scope == UNIT_FILE_USER) {
r = user_config_home(&user_home);
if (r < 0)
return log_oom();
else if (r == 0) {
log_error("Cannot edit units for the user instance: home directory unknown");
return -1;
}
return log_error_errno(r, "Failed to query XDG_CONFIG_HOME: %m");
else if (r == 0)
return log_error_errno(ENOTDIR, "Cannot edit units: $XDG_CONFIG_HOME and $HOME are not set.");
r = user_runtime_dir(&user_runtime);
if (r < 0)
return log_oom();
else if (r == 0) {
log_error("Cannot edit units for the user instance: runtime directory unknown");
return -1;
}
return log_error_errno(r, "Failed to query XDG_CONFIG_HOME: %m");
else if (r == 0)
return log_error_errno(ENOTDIR, "Cannot edit units: $XDG_RUNTIME_DIR is not set.");
}
r = lookup_paths_init(&lp,
@ -6126,10 +6122,8 @@ static int find_paths_to_edit(sd_bus *bus, char **names, char ***paths) {
arg_scope == UNIT_FILE_USER,
arg_root,
NULL, NULL, NULL);
if (r < 0) {
log_error_errno(r, "Failed get lookup paths: %m");
return r;
}
if (r < 0)
return log_error_errno(r, "Failed get lookup paths: %m");
avoid_bus_cache = !bus || avoid_bus();