Merge pull request #9214 from poettering/systemctl-get-processes-fix

two small fixes for systemctl's process tree display
This commit is contained in:
Lennart Poettering
2018-06-07 09:17:01 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -824,7 +824,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) {
assert(p);
r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, p, &f);
if (r == ENOENT)
if (r == -ENOENT)
return 0;
if (r < 0)
return r;
+1 -1
View File
@@ -4345,7 +4345,7 @@ static void print_status_info(
show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, i->control_group, prefix, c, extra, k, get_output_flags());
} else if (r < 0)
log_warning_errno(r, "Failed to dump process list, ignoring: %s", bus_error_message(&error, r));
log_warning_errno(r, "Failed to dump process list for '%s', ignoring: %s", i->id, bus_error_message(&error, r));
}
if (i->id && arg_transport == BUS_TRANSPORT_LOCAL)