From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 19 May 2018 09:39:57 +0000 (+0200)
Subject: core/job: shortening
X-Git-Tag: v239~229
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=509ad7897c7f15b7423e69747ce552d1673f499d;p=thirdparty%2Fsystemd.git

core/job: shortening

Follow-up for a7a7163df7fc8a9f794f6803b2f6c9c9b0745a1f.
---

diff --git a/src/core/job.c b/src/core/job.c
index a0f7685c4e1..92abd60c2f1 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -915,11 +915,10 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive, bool alr
                 j->manager->n_failed_jobs++;
 
         job_uninstall(j);
-        /* Remember jobs started before the reload */
-        if (MANAGER_IS_RELOADING(j->manager) && j->reloaded) {
-                if (job_save_pending_finished_job(j) < 0)
-                        job_free(j);
-        } else
+        /* Keep jobs started before the reload to send singal later, free all others */
+        if (!MANAGER_IS_RELOADING(j->manager) ||
+            !j->reloaded ||
+            job_save_pending_finished_job(j) < 0)
                 job_free(j);
 
         /* Fail depending jobs on failure */