On Tue, 08.01.13 18:20, poljar (Damir Jelić) ([email protected]) wrote:
> Since the introduction of calender timers the timer base can also end > with "Calendar" but systemd asserts if its doesn't end with Sec. > > Now the assert checks also for "Calendar" Ah, yikes. This was actually more broken than just this. I have now did a more complete fix, but it's still not complete, as we currently do expose calendar events nicely at all via the bus... > --- > src/core/dbus-timer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c > index 11d18cb..eb13610 100644 > --- a/src/core/dbus-timer.c > +++ b/src/core/dbus-timer.c > @@ -75,7 +75,7 @@ static int bus_timer_append_timers(DBusMessageIter *i, > const char *property, voi > bool b; > > t = timer_base_to_string(k->base); > - assert(endswith(t, "Sec")); > + assert(endswith(t, "Sec") || endswith(t, "Calendar")); > > /* s/Sec/USec/ */ > l = strlen(t); Lennart -- Lennart Poettering - Red Hat, Inc. _______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
