mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-28 03:25:27 +03:00
Merge pull request #5204 from keszybz/masked-warning-cleanup
Cleanup of error code mismatch for masked units
This commit is contained in:
commit
486b3d08db
@ -907,7 +907,10 @@ int transaction_add_job_and_dependencies(
|
||||
SET_FOREACH(dep, following, i) {
|
||||
r = transaction_add_job_and_dependencies(tr, type, dep, ret, false, false, false, ignore_order, e);
|
||||
if (r < 0) {
|
||||
log_unit_warning(dep, "Cannot add dependency job for, ignoring: %s", bus_error_message(e, r));
|
||||
log_unit_full(dep,
|
||||
r == -ERFKILL ? LOG_INFO : LOG_WARNING,
|
||||
r, "Cannot add dependency job, ignoring: %s",
|
||||
bus_error_message(e, r));
|
||||
sd_bus_error_free(e);
|
||||
}
|
||||
}
|
||||
|
@ -597,12 +597,12 @@ static int journal_file_verify_header(JournalFile *f) {
|
||||
|
||||
state = f->header->state;
|
||||
|
||||
if (state == STATE_ONLINE) {
|
||||
if (state == STATE_ARCHIVED)
|
||||
return -ESHUTDOWN; /* Already archived */
|
||||
else if (state == STATE_ONLINE) {
|
||||
log_debug("Journal file %s is already online. Assuming unclean closing.", f->path);
|
||||
return -EBUSY;
|
||||
} else if (state == STATE_ARCHIVED)
|
||||
return -ESHUTDOWN;
|
||||
else if (state != STATE_OFFLINE) {
|
||||
} else if (state != STATE_OFFLINE) {
|
||||
log_debug("Journal file %s has unknown state %i.", f->path, state);
|
||||
return -EBUSY;
|
||||
}
|
||||
@ -3352,12 +3352,12 @@ int journal_file_open_reliably(
|
||||
|
||||
r = journal_file_open(-1, fname, flags, mode, compress, seal, metrics, mmap_cache, deferred_closes, template, ret);
|
||||
if (!IN_SET(r,
|
||||
-EBADMSG, /* corrupted */
|
||||
-ENODATA, /* truncated */
|
||||
-EHOSTDOWN, /* other machine */
|
||||
-EPROTONOSUPPORT, /* incompatible feature */
|
||||
-EBUSY, /* unclean shutdown */
|
||||
-ESHUTDOWN, /* already archived */
|
||||
-EBADMSG, /* Corrupted */
|
||||
-ENODATA, /* Truncated */
|
||||
-EHOSTDOWN, /* Other machine */
|
||||
-EPROTONOSUPPORT, /* Incompatible feature */
|
||||
-EBUSY, /* Unclean shutdown */
|
||||
-ESHUTDOWN, /* Already archived */
|
||||
-EIO, /* IO error, including SIGBUS on mmap */
|
||||
-EIDRM, /* File has been deleted */
|
||||
-ETXTBSY)) /* File is from the future */
|
||||
|
@ -38,7 +38,7 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = {
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_TRANSACTION_JOBS_CONFLICTING, EDEADLK),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, EDEADLK),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE, EDEADLK),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_UNIT_MASKED, ESHUTDOWN),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_UNIT_MASKED, ERFKILL),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_UNIT_GENERATED, EADDRNOTAVAIL),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_UNIT_LINKED, ELOOP),
|
||||
SD_BUS_ERROR_MAP(BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, EBADR),
|
||||
|
Loading…
Reference in New Issue
Block a user