From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 May 2015 18:39:23 +0000 (+0200)
Subject: core: properly handle jobs that are suppressed to JOB_NOPs when propagating restarts
X-Git-Tag: v220~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48894cd07cdbd125688ade4a5772eaebe5969e74;p=thirdparty%2Fsystemd.git

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

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 33fa675e53e..090103fbdad 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;