3d03076e5d
removing them. - Add systemd-fix-merge-ignore-dependencies.patch: fix merging with --ignore-dependencies waiting for dependencies (bnc#800365). - Update systemd-numlock-suse.patch: udev-trigger.service is now called systemd-udev-trigger.service. - Add improve-man-environment.patch: improve manpage regarding Environment value. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=333
27 lines
822 B
Diff
27 lines
822 B
Diff
From e45460d666512db4f908f86e8722d7932dcf0f82 Mon Sep 17 00:00:00 2001
|
|
From: Michal Schmidt <mschmidt@redhat.com>
|
|
Date: Fri, 25 Jan 2013 19:54:21 +0100
|
|
Subject: [PATCH] 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.
|
|
---
|
|
src/core/job.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/core/job.c b/src/core/job.c
|
|
index e381ea2..6a03d17 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) {
|
|
--
|
|
1.7.10.4
|
|
|