job: when cancelling jobs, make sure to propagate this properly to depending jobs
This commit is contained in:
parent
312732cfaf
commit
c77bc38d28
2
TODO
2
TODO
|
@ -19,6 +19,8 @@ F15:
|
||||||
|
|
||||||
* Make systemd-cryptsetup cancellable
|
* Make systemd-cryptsetup cancellable
|
||||||
|
|
||||||
|
* udev should be able to upgrade its database on its own
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
|
|
||||||
* introduce simple way to do mandatory conditions
|
* introduce simple way to do mandatory conditions
|
||||||
|
|
|
@ -97,7 +97,7 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec
|
||||||
if (!(reply = dbus_message_new_method_return(message)))
|
if (!(reply = dbus_message_new_method_return(message)))
|
||||||
goto oom;
|
goto oom;
|
||||||
|
|
||||||
job_free(j);
|
job_finish_and_invalidate(j, JOB_CANCELED);
|
||||||
|
|
||||||
} else
|
} else
|
||||||
return bus_default_message_handler(j->manager, connection, message, INTROSPECTION, properties);
|
return bus_default_message_handler(j->manager, connection, message, INTROSPECTION, properties);
|
||||||
|
|
|
@ -1823,7 +1823,7 @@ void manager_clear_jobs(Manager *m) {
|
||||||
transaction_abort(m);
|
transaction_abort(m);
|
||||||
|
|
||||||
while ((j = hashmap_first(m->jobs)))
|
while ((j = hashmap_first(m->jobs)))
|
||||||
job_free(j);
|
job_finish_and_invalidate(j, JOB_CANCELED);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned manager_dispatch_run_queue(Manager *m) {
|
unsigned manager_dispatch_run_queue(Manager *m) {
|
||||||
|
|
Loading…
Reference in New Issue