From e9398c59578a4923cfd854cc8e72a1aac8c72f6d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 21 Jul 2011 13:12:15 +0100 Subject: [PATCH 2/3] update_desktop_file_entry: if the service name already existed, set error If we're going to return FALSE for this (which has apparently always been the case), then we should set an error properly. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230 --- bus/activation.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/bus/activation.c b/bus/activation.c index c1f0e94..8c9f559 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -427,8 +427,11 @@ update_desktop_file_entry (BusActivation *activation, if (_dbus_hash_table_lookup_string (activation->entries, name)) { - _dbus_verbose ("The new service name \"%s\" of service file \"%s\" already in cache, ignoring\n", + _dbus_verbose ("The new service name \"%s\" of service file \"%s\" is already in cache, ignoring\n", name, _dbus_string_get_const_data (&file_path)); + dbus_set_error (error, DBUS_ERROR_FAILED, + "The new service name \"%s\" of service file \"%s\" is already in cache, ignoring\n", + name, _dbus_string_get_const_data (&file_path)); goto out; } -- 1.7.5.4