diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-10 10:10:36 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-10 10:10:38 +0000 |
| commit | 21c8094040bba43b5cc5aae016b57eb3b0cac450 (patch) | |
| tree | d5ba49e1002743306f392b1f1794e9470f0bca00 /bus | |
| parent | 349260f245d95a6c8bcc0f000be1f3232c616052 (diff) | |
| parent | fccb5a0fe11a2293ba5bfc09e0f3fe296d724eb2 (diff) | |
| download | dbus-21c8094040bba43b5cc5aae016b57eb3b0cac450.tar.gz | |
Merge branch 'system-search-paths-21620'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21620
Reviewed-by: Lennart Poettering <lennart@poettering.net>
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/config-parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index c636707f..a8953627 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3393,8 +3393,8 @@ test_default_session_servicedirs (void) static const char *test_system_service_dir_matches[] = { #ifdef DBUS_UNIX - "/testusr/testlocal/testshare/dbus-1/system-services", - "/testusr/testshare/dbus-1/system-services", + "/usr/local/share/dbus-1/system-services", + "/usr/share/dbus-1/system-services", #endif DBUS_DATADIR"/dbus-1/system-services", #ifdef DBUS_UNIX |