From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 23 Aug 2022 12:18:41 +0000 (+0200)
Subject: shared/udev-util: say "ignoring device", not "ignoring"
X-Git-Tag: v252-rc1~356^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=406fbeca32d9abacdcc28b0cc00d2beefcc4feb2;p=thirdparty%2Fsystemd.git

shared/udev-util: say "ignoring device", not "ignoring"

The short form sounds like we're ignoring the error.
---

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 0c6dea4264d..db968a17c47 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -683,7 +683,7 @@ int on_ac_power(void) {
 
                 r = sd_device_get_sysattr_value(d, "type", &val);
                 if (r < 0) {
-                        log_device_debug_errno(d, r, "Failed to read 'type' sysfs attribute, ignoring: %m");
+                        log_device_debug_errno(d, r, "Failed to read 'type' sysfs attribute, ignoring device: %m");
                         continue;
                 }
 
@@ -693,7 +693,7 @@ int on_ac_power(void) {
                  * https://docs.kernel.org/admin-guide/abi-testing.html#abi-file-testing-sysfs-class-power */
                 if (streq(val, "Battery")) {
                         found_battery = true;
-                        log_device_debug(d, "The power supply is battery, ignoring.");
+                        log_device_debug(d, "The power supply is battery, ignoring device.");
                         continue;
                 }
 
@@ -702,22 +702,22 @@ int on_ac_power(void) {
                         r = device_is_power_sink(d);
                         if (r <= 0) {
                                 if (r < 0)
-                                        log_device_debug_errno(d, r, "Failed to determine the current power role, ignoring: %m");
+                                        log_device_debug_errno(d, r, "Failed to determine the current power role, ignoring device: %m");
                                 else
-                                        log_device_debug(d, "USB power supply is in source mode, ignoring.");
+                                        log_device_debug(d, "USB power supply is in source mode, ignoring device.");
                                 continue;
                         }
                 }
 
                 r = sd_device_get_sysattr_value(d, "online", &val);
                 if (r < 0) {
-                        log_device_debug_errno(d, r, "Failed to read 'online' sysfs attribute, ignoring: %m");
+                        log_device_debug_errno(d, r, "Failed to read 'online' sysfs attribute, ignoring device: %m");
                         continue;
                 }
 
                 r = safe_atou(val, &v);
                 if (r < 0) {
-                        log_device_debug_errno(d, r, "Failed to parse 'online' attribute, ignoring: %m");
+                        log_device_debug_errno(d, r, "Failed to parse 'online' attribute, ignoring device: %m");
                         continue;
                 }