chiark / gitweb /
manager: fix conflicting job check
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Aug 2010 18:49:35 +0000 (20:49 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Aug 2010 18:49:35 +0000 (20:49 +0200)
src/manager.c

index 7dbc448..cc12d6b 100644 (file)
@@ -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->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;
 
                                 if (!stops_running_service && !changes_existing_job)
                                         continue;