39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
From 11600220d6fa867b0ed4371be61cc0976779d777 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Mon, 30 Nov 2015 21:00:04 -0500
|
|
Subject: [PATCH 2/5] core: do not warn about Wants depencencies on masked
|
|
units
|
|
|
|
When masking is used to prevent a unit from being loaded,
|
|
every transaction with dependent units would generate a warning.
|
|
Downgrade this warning to debug level.
|
|
|
|
transaction_add_job_and_dependencies only generated a few return
|
|
values found in the table in bus_common_errors.c, and EADDRNOTAVAIL
|
|
is not one of them, so do not try to suppress EADDRNOTAVAIL.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1278264
|
|
(cherry picked from commit e43cec8e055da9aaa65c8553c436bdad3e27ddf1)
|
|
|
|
Resolves: #1278264
|
|
---
|
|
src/core/transaction.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/transaction.c b/src/core/transaction.c
|
|
index 090103f..38836ef 100644
|
|
--- a/src/core/transaction.c
|
|
+++ b/src/core/transaction.c
|
|
@@ -964,7 +964,7 @@ int transaction_add_job_and_dependencies(
|
|
r = transaction_add_job_and_dependencies(tr, JOB_START, dep, ret, false, false, false, false, ignore_order, e);
|
|
if (r < 0) {
|
|
log_unit_full(dep,
|
|
- r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, r,
|
|
+ r == -EBADR /* unit masked */ ? LOG_DEBUG : LOG_WARNING, r,
|
|
"Cannot add dependency job, ignoring: %s",
|
|
bus_error_message(e, r));
|
|
sd_bus_error_free(e);
|
|
--
|
|
2.5.0
|
|
|