Attachment 67977 Details for Bug 52202 – activation helper: when compiled for tests, do not reset system bus address

[patch] activation helper: when compiled for tests, do not reset system bus address

0001-activation-helper-when-compiled-for-tests-do-not-res.patch (text/plain), 1.13 KB, created by Simon McVittie on 2012-10-02 08:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-10-02 08:50:09 UTC

Size: 1.13 KB

patch

obsolete

>From d22d07a46ddf5eac5532afc6669fc8c083c37d80 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 2 Oct 2012 09:34:48 +0100
>Subject: [PATCH] activation helper: when compiled for tests, do not reset
> system bus address
>
>Otherwise, the tests try to connect to the real system bus, which will
>often fail - particularly if you run the tests configured for the default
>/usr/local (with no intention of installing the result), in which case
>the tests would try to connect to /usr/local/var/run/dbus/system_bus_socket.
>---
> bus/activation-helper.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/bus/activation-helper.c b/bus/activation-helper.c
>index bfe832e..6567657 100644
>--- a/bus/activation-helper.c
>+++ b/bus/activation-helper.c
>@@ -154,11 +154,11 @@ clear_environment (DBusError *error)
>                       "could not clear environment\n");
>       return FALSE;
>     }
>-#endif
> 
>   /* Ensure the bus is set to system */
>   _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
>   _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
>+#endif
> 
>   return TRUE;
> }
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 52202: 67345 | 67803 | 67804 | 67810 | 67977

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.