From: Michal Schmidt <mschmidt@redhat.com>
Date: Sat, 12 May 2012 19:06:27 +0000 (+0200)
Subject: job: only jobs on the runqueue can be run
X-Git-Tag: v183~122
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=66aa6f7fbb16f441b28196c46a8c3fd60ed39d1b;p=elogind.git

job: only jobs on the runqueue can be run
---

diff --git a/src/core/job.c b/src/core/job.c
index 301d83a9d..90091c298 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -470,11 +470,10 @@ int job_run_and_invalidate(Job *j) {
         assert(j);
         assert(j->installed);
         assert(j->type < _JOB_TYPE_MAX_IN_TRANSACTION);
+        assert(j->in_run_queue);
 
-        if (j->in_run_queue) {
-                LIST_REMOVE(Job, run_queue, j->manager->run_queue, j);
-                j->in_run_queue = false;
-        }
+        LIST_REMOVE(Job, run_queue, j->manager->run_queue, j);
+        j->in_run_queue = false;
 
         if (j->state != JOB_WAITING)
                 return 0;