diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-08 18:33:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-12 17:56:49 +0100 |
| commit | d073dea0a89c271fc4a769d5b3b2db395aa0239a (patch) | |
| tree | 39aba2997495fae648a2756e3794cfde7fe943ca /src/core | |
| parent | d25e100bd6def67f302e43794869b651e780bffa (diff) | |
install: never log from install functions
Instead, let the caller do that. Fix this by moving masked unit messages
into the caller, by returning a clear error code (ESHUTDOWN) by which
this may be detected.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index eaa0fb2b37..efc716913b 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1651,6 +1651,8 @@ static int method_enable_unit_files_generic( scope = m->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER; r = call(scope, runtime, NULL, l, force, &changes, &n_changes); + if (r == -ESHUTDOWN) + return sd_bus_error_setf(error, BUS_ERROR_UNIT_MASKED, "Unit file is masked"); if (r < 0) return r; @@ -1885,6 +1887,8 @@ static int method_add_dependency_unit_files(sd_bus_message *message, void *userd scope = m->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER; r = unit_file_add_dependency(scope, runtime, NULL, l, target, dep, force, &changes, &n_changes); + if (r == -ESHUTDOWN) + return sd_bus_error_setf(error, BUS_ERROR_UNIT_MASKED, "Unit file is masked"); if (r < 0) return r; |