]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bus-unit-util: never call into log_job_error_with_service_result() if we are not...
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Mar 2019 18:18:37 +0000 (19:18 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Mar 2019 16:38:43 +0000 (17:38 +0100)
The call can't handle non-services, hence don't bother.

src/shared/bus-unit-util.c

index 6410b389e52d308e4380c2f308e0f8d71ab6b6f4..e753eafd85af436a373153b71d8c540d7a044adc 100644 (file)
@@ -1986,6 +1986,7 @@ finish:
 }
 
 static int check_wait_response(BusWaitForJobs *d, bool quiet, const char* const* extra_args) {
+        assert(d);
         assert(d->result);
 
         if (!quiet) {
@@ -2006,7 +2007,8 @@ static int check_wait_response(BusWaitForJobs *d, bool quiet, const char* const*
                 else if (streq(d->result, "once"))
                         log_error("Unit %s was started already once and can't be started again.", strna(d->name));
                 else if (!STR_IN_SET(d->result, "done", "skipped")) {
-                        if (d->name) {
+
+                        if (d->name && endswith(d->name, ".service")) {
                                 _cleanup_free_ char *result = NULL;
                                 int q;