mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 07:04:28 +00:00
0f53a3fca8
the NixOS system bus configuration to include directories such as
/nix/var/nix/profiles/default/etc/dbus-1/system.d/
which may not exist.
svn path=/nixpkgs/branches/x-updates/; revision=22672
24 lines
659 B
Diff
24 lines
659 B
Diff
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;
|