From d39b034af6f9795c4f17a8ddd186f026bb74193c Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 19 Sep 2012 08:15:07 +0200 Subject: 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. --- src/systemctl/systemctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/systemctl') diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 15c08668c8..729d4dd324 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -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; } -- cgit v1.2.3-54-g00ecf