From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 18 Apr 2012 16:15:49 +0000 (+0200)
Subject: transaction: do not add installed jobs to the transaction
X-Git-Tag: v183~243
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3c956cfee29fe2642fbe257f55adb3583a4af878

transaction: do not add installed jobs to the transaction

Do not attempt to optimize away the job creation by refering to installed jobs.
We do not want to disturb installed jobs until commiting the transaction.

(A later patch to job merging will make the separation of transaction jobs and
installed jobs complete.)
---

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 2a6f1de13..c00dd452e 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -760,13 +760,9 @@ static Job* transaction_add_one_job(Transaction *tr, JobType type, Unit *unit, b
                 }
         }
 
-        if (unit->job && unit->job->type == type)
-                j = unit->job;
-        else {
-                j = job_new(unit, type);
-                if (!j)
-                        return NULL;
-        }
+        j = job_new(unit, type);
+        if (!j)
+                return NULL;
 
         j->generation = 0;
         j->marker = NULL;