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

Replace build-time prefix with installation prefix when including config files

Browse source 
This was already done for the contents of .service files, but not
config files.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
Tested-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2015-10-01 13:05:02 +01:00
parent f830e14d30
commit 9b8f844e10
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bus/config-parser.c
View file

@ -2122,7 +2122,8 @@ make_full_path (const DBusString *basedir,
{
if (_dbus_path_is_absolute (filename))
{
return _dbus_string_copy (filename, 0, full_path, 0);
if (!_dbus_string_copy (filename, 0, full_path, 0))
return FALSE;
}
else
{
@ -2131,9 +2132,12 @@ make_full_path (const DBusString *basedir,
if (!_dbus_concat_dir_and_file (full_path, filename))
return FALSE;
return TRUE;
}
if (!_dbus_replace_install_prefix (full_path))
return FALSE;
return TRUE;
}
static dbus_bool_t