From 8ace1db703680ebe13321e1eb38c38ef27e6e153 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Jun 2018 17:37:20 +0200 Subject: [PATCH] core: rework manager_load_startable_unit_or_warn() on top of unit_validate_load_state() These functions do very similar work, let's unify common code. --- src/core/manager.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 04e0c6f..e1ce922 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1954,16 +1954,12 @@ int manager_load_startable_unit_or_warn( r = manager_load_unit(m, name, path, &error, &unit); if (r < 0) return log_error_errno(r, "Failed to load %s %s: %s", - name ? "unit" : "file", name ?: path, + name ? "unit" : "unit file", name ?: path, bus_error_message(&error, r)); - else if (IN_SET(unit->load_state, UNIT_ERROR, UNIT_NOT_FOUND)) - return log_error_errno(unit->load_error, "Failed to load %s %s: %m", - name ? "unit" : "file", name ?: path); - else if (unit->load_state == UNIT_MASKED) { - log_error("%s %s is masked.", - name ? "Unit" : "File", name ?: path); - return -ERFKILL; - } + + r = bus_unit_validate_load_state(unit, &error); + if (r < 0) + return log_error_errno(r, "%s", bus_error_message(&error, r)); *ret = unit; return 0; -- 2.7.4