dbus/bus activation.c,1.47,1.48

[John Palmieri]

Update of /cvs/dbus/dbus/bus
In directory kemper:/tmp/cvs-serv5691/bus

Modified Files:
	activation.c 
Log Message:
* bus/activation.c (bus_activation_new): don't fail if we can not read
  the directory as it may not exist


Index: activation.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/activation.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- activation.c	11 Sep 2006 17:41:21 -0000	1.47
+++ activation.c	3 Nov 2006 01:03:43 -0000	1.48
@@ -736,9 +736,15 @@
           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);
     }