fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 04:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Dimitri John Ledkov 2015-02-25 14:10:47 +00:00 • committed by Simon McVittie
parent 18c01b05b8
commit 57971f69ef
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bus/config-parser.c
View file

@ -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: