From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 9 Aug 2023 16:13:42 +0000 (+0800)
Subject: battery-util: don't log duplicate message
X-Git-Tag: v255-rc1~734^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d83c3e866ab32f7e753fe8f1db9f2fb295bf4f;p=thirdparty%2Fsystemd.git

battery-util: don't log duplicate message

Follow-up for 02f7f8aa4f1d0b7a24ee3cd5685a791771d9ded5

Addresses https://github.com/systemd/systemd/pull/28597#discussion_r1288591215

> this is pretty unnecessary, battery_read_capacity_percentage()
debug logs on its own about this already, in more detailed way?
---

diff --git a/src/shared/battery-util.c b/src/shared/battery-util.c
index 8b7bdc704d2..cc3835f9064 100644
--- a/src/shared/battery-util.c
+++ b/src/shared/battery-util.c
@@ -224,7 +224,7 @@ int battery_read_capacity_percentage(sd_device *dev) {
                 return log_device_debug_errno(dev, r, "Failed to read/parse POWER_SUPPLY_CAPACITY: %m");
 
         if (battery_capacity < 0 || battery_capacity > 100)
-                return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ERANGE), "Invalid battery capacity");
+                return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ERANGE), "Invalid battery capacity: %d", battery_capacity);
 
         return battery_capacity;
 }
@@ -254,7 +254,6 @@ int battery_is_discharging_and_low(void) {
 
                 level = battery_read_capacity_percentage(dev);
                 if (level < 0) {
-                        log_device_debug_errno(dev, level, "Battery capacity is unreadable: %m");
                         unsure = true;
                         continue;
                 }