chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23a177e
)
manager: if wanted dependencies are invalid, don't fail
author
Lennart Poettering
<lennart@poettering.net>
Tue, 6 Apr 2010 00:44:23 +0000
(
02:44
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 6 Apr 2010 00:44:23 +0000
(
02:44
+0200)
manager.c
patch
|
blob
|
history
diff --git
a/manager.c
b/manager.c
index 42059a500717f7fd77516ea63f12184783bea0e4..87941e3f56f4dfab2d2ac65f38b1e81dc8f28dd0 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-1175,8
+1175,8
@@
static int transaction_add_job_and_dependencies(Manager *m, JobType type, Unit *
if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !force, force, NULL)) < 0 && r != -EBADR)
goto fail;
SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_WANTS], i)
if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !force, force, NULL)) < 0 && r != -EBADR)
goto fail;
SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_WANTS], i)
- if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) < 0
&& r != -EBADR
)
-
goto fail
;
+ if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) < 0)
+
log_warning("Cannot add dependency job for unit %s, ignoring: %s", unit_id(dep), strerror(-r))
;
SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE], i)
if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, force, NULL)) < 0 && r != -EBADR)
goto fail;
SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE], i)
if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, force, NULL)) < 0 && r != -EBADR)
goto fail;