From 68a4b89ca3305a31b639400d04c1484f991b556f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 25 Jan 2018 17:45:53 +0900 Subject: [PATCH] bus-util: fix format of NextElapseUSecRealtime= and LastTriggerUSec= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 6b177afb8cc..548e817105e 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -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);