diff options
| author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-02-25 14:10:47 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-25 15:59:24 +0000 |
| commit | 57971f69ef610079d16e32de78c2dfaf9a8750a1 (patch) | |
| tree | b0b4d717fa4794f5299a9eb208b8bdb37b1256fd | |
| parent | 18c01b05b894068d6b604f441c33a5a659cf1e88 (diff) | |
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>
| -rw-r--r-- | bus/config-parser.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index 58048a50..1540fe43 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: |