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

bus-util: add articles to explanation messages

Browse Source 
We are talking about one member of a group of things (resource limits, signals,
timeouts), without specifying which one. An indenfinite article is in order.

When we are talking about the control process, it's a specific one, so the
definite article is used.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-04-12 10:20:36 -04:00
parent f8bc41822b
commit a61cc460e8
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-util.c
+8 -9
View File
@@ -1733,13 +1733,13 @@ static int bus_job_get_service_result(BusWaitForJobs *d, char **result) {
static const struct {
const char *result, *explanation;
} explanations [] = {
{ "resources", "configured resource limit was exceeded" },
{ "timeout", "timeout was exceeded" },
{ "exit-code", "control process exited with error code" },
{ "signal", "fatal signal was delivered to the control process" },
{ "core-dump", "fatal signal was delivered to the control process. Core dumped" },
{ "watchdog", "service failed to send watchdog ping" },
{ "start-limit", "start of the service was attempted too often too quickly" }
{ "resources", "a configured resource limit was exceeded" },
{ "timeout", "a timeout was exceeded" },
{ "exit-code", "the control process exited with error code" },
{ "signal", "a fatal signal was delivered to the control process" },
{ "core-dump", "a fatal signal was delivered causing the control process to dump core" },
{ "watchdog", "the service failed to send watchdog ping" },
{ "start-limit", "start of the service was attempted too often" }
};
static void log_job_error_with_service_result(const char* service, const char *result) {
@@ -1767,8 +1767,7 @@ static void log_job_error_with_service_result(const char* service, const char *r
/* For some results maybe additional explanation is required */
if (streq_ptr(result, "start-limit"))
log_info("To force a start please invoke \"systemctl reset-failed %s\" followed by \"systemctl start %s\" again.",
strna(service_shell_quoted),
log_info("To force a start use \"systemctl reset-failed %1$s\" followed by \"systemctl start %1$s\" again.",
strna(service_shell_quoted));
}