Make include_dir non-existing directory, to not be an error.

Empty include directories were already not treated as failures.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280
Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/bus/config-parser.c b/bus/config-parser.c
index 58048a50994a86086a536b1863153b82c5b22025..1540fe435fc21b034204736321a4b8ee3ff2d8b2 100644 (file)
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -2265,7 +2265,13 @@ include_dir (BusConfigParser   *parser,
   dir = _dbus_directory_open (dirname, error);
 
   if (dir == NULL)
-    goto failed;
+    {
+      if (dbus_error_has_name (error, DBUS_ERROR_FILE_NOT_FOUND))
+        {
+          dbus_error_free (error);
+          goto success;
+        }
+    }
 
   dbus_error_init (&tmp_error);
   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
@@ -2335,6 +2341,7 @@ include_dir (BusConfigParser   *parser,
       goto failed;
     }
 
+ success:
   retval = TRUE;
   
  failed: