From: iplayinsun <iplayinsun@gmail.com>
Date: Fri, 21 Apr 2017 09:00:47 +0000 (+0900)
Subject: core: move checking default_dependencies into target_add_default_dependencies. (... 
X-Git-Tag: v234~312
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41c237af809c2145f1d9a74a8288dd5a54e5eb0b;p=thirdparty%2Fsystemd.git

core: move checking default_dependencies into target_add_default_dependencies. (#5762)

Almost units check default_dependencies within [unit]_add_default_dependencies
except target unit.
---

diff --git a/src/core/target.c b/src/core/target.c
index ff0d764fb5b..2a58dd394d0 100644
--- a/src/core/target.c
+++ b/src/core/target.c
@@ -63,6 +63,9 @@ static int target_add_default_dependencies(Target *t) {
 
         assert(t);
 
+        if (!UNIT(t)->default_dependencies)
+                return 0;
+
         /* Imply ordering for requirement dependencies on target
          * units. Note that when the user created a contradicting
          * ordering manually we won't add anything in here to make
@@ -93,7 +96,7 @@ static int target_load(Unit *u) {
                 return r;
 
         /* This is a new unit? Then let's add in some extras */
-        if (u->load_state == UNIT_LOADED && u->default_dependencies) {
+        if (u->load_state == UNIT_LOADED) {
                 r = target_add_default_dependencies(t);
                 if (r < 0)
                         return r;