Attachment 118558 Details for Bug 92028 – Replace build-time prefix with installation prefix when including config files

[patch] Replace build-time prefix with installation prefix when including config files

0001-Replace-build-time-prefix-with-installation-prefix-w.patch (text/plain), 1.19 KB, created by Simon McVittie on 2015-10-01 12:14:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-10-01 12:14:24 UTC

Size: 1.19 KB

patch

obsolete

>From 645d8aed35a4a5bb2d41c28c585606a0392da46d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 1 Oct 2015 13:05:02 +0100
>Subject: [PATCH] Replace build-time prefix with installation prefix when
> including config files
>
>This was already done for the contents of .service files, but not
>config files.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
>---
> bus/config-parser.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/bus/config-parser.c b/bus/config-parser.c
>index 3cd17cc..a0fc47c 100644
>--- a/bus/config-parser.c
>+++ b/bus/config-parser.c
>@@ -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
>-- 
>2.6.0
>

Actions: View | Splinter Review

Attachments on bug 92028: 118326 | 118347 | 118348 | 118543 | 118558 | 118574

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.