From: Lennart Poettering Date: Tue, 6 Apr 2010 00:44:23 +0000 (+0200) Subject: manager: if wanted dependencies are invalid, don't fail X-Git-Tag: v1~655 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8b44eabff0dd0dcbee1af637bc7d9d2b9dfcd427;ds=inline manager: if wanted dependencies are invalid, don't fail --- diff --git a/manager.c b/manager.c index 42059a500..87941e3f5 100644 --- 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, 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;