From b6f91340c36b8f6c54f3149f901ec40d93e9b881 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 3 Nov 2006 01:03:43 +0000 Subject: * bus/activation.c (bus_activation_new): don't fail if we can not read the directory as it may not exist --- ChangeLog | 5 +++++ bus/activation.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd9e412b..f61ab4f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-02 John (J5) Palmieri + + * bus/activation.c (bus_activation_new): don't fail if we can not read + the directory as it may not exist + 2006-11-02 John (J5) Palmieri * bus/config-parser.c (service_dirs_find_dir): use diff --git a/bus/activation.c b/bus/activation.c index 8f9d653f..19b4d66a 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -736,9 +736,15 @@ bus_activation_new (BusContext *context, goto failed; } + /* only fail on OOM, it is ok if we can't read the directory */ if (!update_directory (activation, s_dir, error)) - goto failed; - + { + if (dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY)) + goto failed; + else + dbus_error_free (error); + } + link = _dbus_list_get_next_link (directories, link); } -- cgit