* bus/activation.c (bus_activation_new): don't fail if we can not read

  the directory as it may not exist

diff --git a/ChangeLog b/ChangeLog
index bd9e412..f61ab4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-11-02  John (J5) Palmieri  <johnp@redhat.com>
 
+       * 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  <johnp@redhat.com>
+
        * bus/config-parser.c (service_dirs_find_dir): use 
        _dbus_list_get_next_link so we don't get stuck in an infinite loop
        (start_busconfig_child): move processing of standard_session_servicedirs

diff --git a/bus/activation.c b/bus/activation.c
index 8f9d653..19b4d66 100644 (file)
--- 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);
     }