From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Aug 2010 18:49:35 +0000 (+0200)
Subject: manager: fix conflicting job check
X-Git-Tag: v6~9
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=48a21c9b37372e508fdf1f29a0b4dc90ea051ba3;hp=674a6e4d0cae372f34df94dfab2513e071d5dc58

manager: fix conflicting job check
---

diff --git a/src/manager.c b/src/manager.c
index 7dbc44826..cc12d6bf2 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -1068,7 +1068,7 @@ static void transaction_minimize_impact(Manager *m) {
                                         j->type == JOB_STOP && UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(j->unit));
 
                                 changes_existing_job =
-                                        j->unit->meta.job && job_type_is_conflicting(j->type, j->unit->meta.job->state);
+                                        j->unit->meta.job && job_type_is_conflicting(j->type, j->unit->meta.job->type);
 
                                 if (!stops_running_service && !changes_existing_job)
                                         continue;