Magellan Linux

Annotation of /trunk/systemd/patches/systemd-37-unit-fix-complementing-of-requirement-deps-with-after.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1562 - (hide annotations) (download)
Thu Nov 17 14:00:05 2011 UTC (12 years, 6 months ago) by niro
File size: 1161 byte(s)
fedora and upstream fixes
1 niro 1562 From a65cb51f29ee177f6f800c87232b68475216a418 Mon Sep 17 00:00:00 2001
2     From: Michal Schmidt <mschmidt@redhat.com>
3     Date: Fri, 23 Sep 2011 13:58:00 +0200
4     Subject: [PATCH] unit: fix complementing of requirement deps with After deps
5     for targets
6    
7     'man systemd.target' says:
8     Unless DefaultDependencies= is set to false, target units will
9     implicitly complement all configured dependencies of type
10     Wants=, Requires=, RequiresOverridable= with dependencies of type
11     After= if the units in question also have DefaultDependencies=true.
12    
13     It did not work because of a forgotten negation.
14     ---
15     src/unit.c | 2 +-
16     1 files changed, 1 insertions(+), 1 deletions(-)
17    
18     diff --git a/src/unit.c b/src/unit.c
19     index 0b435cb..903a8e4 100644
20     --- a/src/unit.c
21     +++ b/src/unit.c
22     @@ -774,7 +774,7 @@ int unit_add_default_target_dependency(Unit *u, Unit *target) {
23     /* If either side wants no automatic dependencies, then let's
24     * skip this */
25     if (!u->meta.default_dependencies ||
26     - target->meta.default_dependencies)
27     + !target->meta.default_dependencies)
28     return 0;
29    
30     /* Don't create loops */
31     --
32     1.7.4.4
33