X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.c;h=ace480c4dd5f0185a6d22ec2386bd2f7a7483d00;hp=7a31c0c9d2809f2f7edf93a6952ae5524bb33997;hb=c0dafa4853b52741e9a4845419c00611426cefd8;hpb=0262225c0ca1e77517aacd40d093f9533de72027;ds=sidebyside diff --git a/manager.c b/manager.c index 7a31c0c9d..ace480c4d 100644 --- a/manager.c +++ b/manager.c @@ -901,6 +901,9 @@ static int transaction_add_job_and_dependencies(Manager *m, JobType type, Unit * /* JOB_VERIFY_STARTED, JOB_RELOAD require no dependency handling */ } + if (_ret) + *_ret = ret; + return 0; fail: @@ -918,7 +921,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for log_debug("Trying to enqueue job %s/%s", unit_id(unit), job_type_to_string(type)); - if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret))) { + if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret)) < 0) { transaction_abort(m); return r; } @@ -926,7 +929,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for if ((r = transaction_activate(m, mode)) < 0) return r; - log_debug("Enqueued job %s/%s", unit_id(unit), job_type_to_string(type)); + log_debug("Enqueued job %s/%s as %u", unit_id(unit), job_type_to_string(type), (unsigned) ret->id); if (_ret) *_ret = ret;