diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-29 01:15:18 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-29 16:28:27 +0200 |
| commit | ead8e4788ee31bbdc38b4cd3c6e71c8a95bbc95a (patch) | |
| tree | c990f3342cbaf0280890bbd73680f5a67fadcf48 /src/manager.c | |
| parent | 9ed81015f0a426d98c2ad8f14d6f27a5058a726d (diff) | |
unit: get rid of gnoreDependencyFailure= instead treat ConflictedBy= as weaker counterpart of Conflicts=, similar to Wants= vs. Requires=
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/manager.c b/src/manager.c index 796d3cbebe..9fa4877016 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1483,7 +1483,7 @@ static int transaction_add_job_and_dependencies( goto fail; SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_CONFLICTED_BY], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, override, false, e, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, false, override, false, e, NULL)) < 0 && r != -EBADR) goto fail; } else if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) { |