diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
| commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
| tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/dbus/dbus/dbus-quiesce-startup-errors.patch | |
| parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
| download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz | |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dbus/dbus/dbus-quiesce-startup-errors.patch')
| -rw-r--r-- | meta/packages/dbus/dbus/dbus-quiesce-startup-errors.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/packages/dbus/dbus/dbus-quiesce-startup-errors.patch b/meta/packages/dbus/dbus/dbus-quiesce-startup-errors.patch new file mode 100644 index 0000000000..ba5142af2f --- /dev/null +++ b/meta/packages/dbus/dbus/dbus-quiesce-startup-errors.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | --- dbus-0.20-virgin-patches/bus/config-parser.c 2003-10-14 21:30:21.000000000 +0100 | ||
| 2 | +++ dbus-0.20/bus/config-parser.c 2004-02-10 00:40:05.000000000 +0000 | ||
| 3 | @@ -1710,8 +1710,18 @@ | ||
| 4 | { | ||
| 5 | if (!include_file (parser, &full_path, TRUE, error)) | ||
| 6 | { | ||
| 7 | - _dbus_string_free (&full_path); | ||
| 8 | - goto failed; | ||
| 9 | + /* Debian patch to skip malformed /etc/dbus-1/system.d entries */ | ||
| 10 | + /* | ||
| 11 | + * _dbus_string_free (&full_path); | ||
| 12 | + * goto failed; | ||
| 13 | + */ | ||
| 14 | + if (dbus_error_is_set (error)) | ||
| 15 | + { | ||
| 16 | + _dbus_warn("\nEncountered error '%s' while parsing '%s'\n", | ||
| 17 | + error->message, | ||
| 18 | + _dbus_string_get_const_data(&full_path)); | ||
| 19 | + dbus_error_free (error); | ||
| 20 | + } | ||
| 21 | } | ||
| 22 | } | ||
| 23 | |||