diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-21 13:12:15 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-21 11:34:07 +0100 |
| commit | c38e9823da1980d4323006f86ec5968be7d64e76 (patch) | |
| tree | 829304e4f25aa72458a93d5020be56f523c08a3c | |
| parent | 9e93d82862c4c9af9f2da9cba74b70ff98fd3b60 (diff) | |
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
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
| -rw-r--r-- | bus/activation.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bus/activation.c b/bus/activation.c index c1f0e949..8c9f5598 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; } |