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

systemctl: properly report success 

Systemctl would always return 1, because it treated uninteresting dbus
messages ("job added") as errors. Just ignore everything apart from
interesting ("job removed") messages.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-09-19 08:15:07 +02:00
parent 46eddbb597
commit d39b034af6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/systemctl/systemctl.c
View File

@ -1322,7 +1322,10 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) {
return -ECONNREFUSED;
}
if (!arg_quiet && d.result) {
if (!d.result)
goto free_name;
if (!arg_quiet) {
if (streq(d.result, "timeout"))
log_error("Job for %s timed out.", strna(d.name));
else if (streq(d.result, "canceled"))
@ -1343,11 +1346,12 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) {
free(d.result);
d.result = NULL;
free_name:
free(d.name);
d.name = NULL;
}
/* This is slightly dirty, since we don't undo the filter registration. */
dbus_connection_remove_filter(bus, wait_filter, &d);
return r;
}