core: properly handle jobs that are suppressed to JOB_NOPs when propagating restarts

2015-05-21 20:49:24 +02:00
parent f7a73a2558
commit 48894cd07c
1 changed files with 6 additions and 1 deletions
@@ -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;