SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install: never log from install functions

Browse Source 
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.
This commit is contained in:
Lennart Poettering
2015-11-12 17:56:49 +01:00
parent d25e100bd6
commit d073dea0a8
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/install.c
+7 -13
View File
@@ -1501,12 +1501,9 @@ int unit_file_add_dependency(
state = unit_file_get_state(scope, root_dir, *i);
if (state < 0)
return log_error_errno(state, "Failed to get unit file state for %s: %m", *i);
if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) {
log_error("Failed to enable unit: Unit %s is masked", *i);
return -EOPNOTSUPP;
}
return state;
if (IN_SET(state, UNIT_FILE_MASKED, UNIT_FILE_MASKED_RUNTIME))
return -ESHUTDOWN;
r = install_info_add_auto(&c, *i);
if (r < 0)
@@ -1577,14 +1574,11 @@ int unit_file_enable(
STRV_FOREACH(i, files) {
UnitFileState state;
/* We only want to know if this unit is masked, so we ignore
* errors from unit_file_get_state, deferring other checks.
* This allows templated units to be enabled on the fly. */
state = unit_file_get_state(scope, root_dir, *i);
if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) {
log_error("Failed to enable unit: Unit %s is masked", *i);
return -EOPNOTSUPP;
}
if (state < 0)
return state;
if (IN_SET(state, UNIT_FILE_MASKED, UNIT_FILE_MASKED_RUNTIME))
return -ESHUTDOWN;
r = install_info_add_auto(&c, *i);
if (r < 0)