summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-01-14 12:33:19 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-01-14 12:33:19 -0500
commit50b480246cf28820fb7b80894cb110402d8eecdf (patch)
treed3ed9f08e690b43d88fed4a9a0bf9725348680fe
parentbecc96b7264a7f56dc2024bb3000cd179526c43e (diff)
parentf14637fc19c449502af0209d1862e4f829c5cb47 (diff)
Merge pull request #2322 from fbuihuu/downgrade-warn-for-not-found-unit
transaction: downgrade warnings about wanted units which are not found
-rw-r--r--src/core/transaction.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/transaction.c b/src/core/transaction.c
index 2f163190e9..bc85cef266 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -949,9 +949,10 @@ int transaction_add_job_and_dependencies(
SET_FOREACH(dep, ret->unit->dependencies[UNIT_WANTS], i) {
r = transaction_add_job_and_dependencies(tr, JOB_START, dep, ret, false, false, false, ignore_order, e);
if (r < 0) {
+ /* unit masked and unit not found are not considered as errors. */
log_unit_full(dep,
- r == -EBADR /* unit masked */ ? LOG_DEBUG : LOG_WARNING, r,
- "Cannot add dependency job, ignoring: %s",
+ r == -EBADR || r == -ENOENT ? LOG_DEBUG : LOG_WARNING,
+ r, "Cannot add dependency job, ignoring: %s",
bus_error_message(e, r));
sd_bus_error_free(e);
}