From 5b47f47f466276d2fc86c103cfac6d6b6b0e96ca Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 25 Feb 2015 14:10:47 +0000 Subject: [PATCH 1/2] Make include_dir non-existing directory, to not be an error. Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Empty include directories were already not treated as failures. Signed-off-by: Dimitri John Ledkov --- bus/config-parser.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bus/config-parser.c b/bus/config-parser.c index 58048a5..1540fe4 100644 --- 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: -- 2.1.0