From 14a1a94c2550ca2d7b8f1e8dce22863884a6f26f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 11 Apr 2015 19:39:30 -0400 Subject: [PATCH] bus-util: add articles to explanation messages 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. --- src/libelogind/sd-bus/bus-util.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libelogind/sd-bus/bus-util.c b/src/libelogind/sd-bus/bus-util.c index ee002a55f..5bd7885e4 100644 --- a/src/libelogind/sd-bus/bus-util.c +++ b/src/libelogind/sd-bus/bus-util.c @@ -1745,13 +1745,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) { @@ -1779,8 +1779,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)); } -- 2.30.2