diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-22 15:22:52 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-22 15:22:52 +0200 |
| commit | 59e132a7f416d7c4a33a46d791f250e03d2c2cd0 (patch) | |
| tree | b405cf3beaeae3c693f441c45c74cd7ac389db02 | |
| parent | 7c0436b94c52915f2c39fe4a29616313378c3b78 (diff) | |
transaction: downgrade warnings about masked units
| -rw-r--r-- | src/core/transaction.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/transaction.c b/src/core/transaction.c index 91feab0398..a8b7e4c25d 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -843,7 +843,7 @@ int transaction_add_job_and_dependencies( if (type != JOB_STOP && unit->load_state == UNIT_MASKED) { dbus_set_error(e, BUS_ERROR_MASKED, "Unit %s is masked.", unit->id); - return -EINVAL; + return -EADDRNOTAVAIL; } if (!unit_job_is_applicable(unit, type)) { @@ -913,7 +913,8 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUIRES_OVERRIDABLE], i) { r = transaction_add_job_and_dependencies(tr, JOB_START, dep, ret, !override, override, false, false, ignore_order, e); if (r < 0) { - log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r)); + log_full(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, + "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r)); if (e) dbus_error_free(e); @@ -923,7 +924,8 @@ 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, false, ignore_order, e); if (r < 0) { - log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r)); + log_full(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, + "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r)); if (e) dbus_error_free(e); @@ -944,7 +946,8 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUISITE_OVERRIDABLE], i) { r = transaction_add_job_and_dependencies(tr, JOB_VERIFY_ACTIVE, dep, ret, !override, override, false, false, ignore_order, e); if (r < 0) { - log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r)); + log_full(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, + "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r)); if (e) dbus_error_free(e); |