]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bus-util: fix format of NextElapseUSecRealtime= and LastTriggerUSec=
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 25 Jan 2018 08:45:53 +0000 (17:45 +0900)
committerLennart Poettering <lennart@poettering.net>
Thu, 25 Jan 2018 13:49:24 +0000 (14:49 +0100)
Before this, `systemctl show` for calendar type timer unit outputs
something like below.
```
NextElapseUSecRealtime=48y 3w 3d 15h
NextElapseUSecMonotonic=0
LastTriggerUSec=48y 3w 3d 3h 41min 44.093095s
LastTriggerUSecMonotonic=0
```
As both NextElapseUSecRealtime= and LastTriggerUSec= are not timespan
but timestamp, this makes format these values by `format_timestamp()`.

src/shared/bus-util.c

index 6b177afb8cc5535302a04bbe12842f1fba14c2e2..548e817105e827c454387b79863d77a0c0e1b6b9 100644 (file)
@@ -711,7 +711,7 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b
                 /* Yes, heuristics! But we can change this check
                  * should it turn out to not be sufficient */
 
-                if (endswith(name, "Timestamp")) {
+                if (endswith(name, "Timestamp") || STR_IN_SET(name, "NextElapseUSecRealtime", "LastTriggerUSec")) {
                         char timestamp[FORMAT_TIMESTAMP_MAX], *t;
 
                         t = format_timestamp(timestamp, sizeof(timestamp), u);