From 48894cd07cdbd125688ade4a5772eaebe5969e74 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 21 May 2015 20:39:23 +0200 Subject: core: properly handle jobs that are suppressed to JOB_NOPs when propagating restarts --- src/core/transaction.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/transaction.c b/src/core/transaction.c index 33fa675e53..090103fbda 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -1032,8 +1032,13 @@ int transaction_add_job_and_dependencies( for (j = 0; j < ELEMENTSOF(propagate_deps); j++) SET_FOREACH(dep, ret->unit->dependencies[propagate_deps[j]], i) { + JobType nt; - r = transaction_add_job_and_dependencies(tr, job_type_collapse(ptype, dep), dep, ret, true, override, false, false, ignore_order, e); + nt = job_type_collapse(ptype, dep); + if (nt == JOB_NOP) + continue; + + r = transaction_add_job_and_dependencies(tr, nt, dep, ret, true, override, false, false, ignore_order, e); if (r < 0) { if (r != -EBADR) goto fail; -- cgit v1.2.3-54-g00ecf