From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 25 Jan 2013 18:54:21 +0000 (+0100)
Subject: job: fix merging with --ignore-dependencies
X-Git-Tag: v198~403
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e45460d666512db4f908f86e8722d7932dcf0f82;hp=b5da077ddf01546c4a85688624d6957766d6c00c;ds=sidebyside

job: fix merging with --ignore-dependencies

This fixes a bug where a job with --ignore-dependencies would wait for
other jobs because it merged into a previously queued job.
---

diff --git a/src/core/job.c b/src/core/job.c
index e381ea2b6..6a03d17aa 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -166,6 +166,7 @@ static void job_merge_into_installed(Job *j, Job *other) {
                 assert(other->type == JOB_NOP);
 
         j->override = j->override || other->override;
+        j->ignore_order = j->ignore_order || other->ignore_order;
 }
 
 Job* job_install(Job *j) {