This reverts commitwip/yesmand088e0621e
. The D-Bus update breaks logind and polkit. (cherry picked from commit2e06e5eb36
) Hydra had rebuilt this on staging, fixing many test problems. There were also phonon changes in these rebuilds, but the amount of binaries affected by them is relatively low and I'm not yet fully convinced of their stability.
parent
6700ed5f48
commit
9eb107dc52
@ -0,0 +1,23 @@ |
||||
diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
|
||||
--- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100
|
||||
+++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200
|
||||
@@ -2159,12 +2159,16 @@
|
||||
|
||||
retval = FALSE;
|
||||
|
||||
- dir = _dbus_directory_open (dirname, error);
|
||||
+ dbus_error_init (&tmp_error);
|
||||
+
|
||||
+ dir = _dbus_directory_open (dirname, &tmp_error);
|
||||
|
||||
if (dir == NULL)
|
||||
- goto failed;
|
||||
+ {
|
||||
+ retval = TRUE;
|
||||
+ goto failed;
|
||||
+ }
|
||||
|
||||
- dbus_error_init (&tmp_error);
|
||||
while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
|
||||
{
|
||||
DBusString full_path;
|
Loading…
Reference in new issue