[systemd-commits] src/libsystemd
Tom Gundersen
tomegun at kemper.freedesktop.org
Fri Feb 13 07:38:12 PST 2015
src/libsystemd/sd-bus/bus-util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a8ba6cd15d3a5edf1f9fbb4fd08dc428c3939072
Author: Tom Gundersen <teg at jklm.no>
Date: Fri Feb 13 16:20:45 2015 +0100
exit-on-idle: only exit if actually idle
sd_event_wait() returning 0 usually means that it timed out, which means it must
have been idle. However, sd_event_wait() may return 0 in case an event was triggered
but it turned out there was nothing to do. Make the check for idle explicit to avoid
this edge-case.
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
index c9d8713..52d4ebe 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -123,7 +123,7 @@ int bus_event_loop_with_idle(
if (r < 0)
return r;
- if (r == 0 && !exiting) {
+ if (r == 0 && !exiting && idle) {
r = sd_bus_try_close(bus);
if (r == -EBUSY)
More information about the systemd-commits
mailing list