mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-24 02:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

sd-bus: improve bus error message for uknown properties

Browse Source 
"Unknown interface or property." →
"Unknown interface org.freedesktop.network1.Link or property BitRates."
(I don't think the quotes are necessary. Dbus names have pretty strict rules.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-05-31 15:33:46 +02:00
parent 8210a61ad5
commit 9e5205d2f7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libsystemd/sd-bus/bus-objects.c
View File

@ -1437,16 +1437,22 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
return 0;
if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Get") ||
sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Set"))
sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Set")) {
const char *interface = NULL, *property = NULL;
(void) sd_bus_message_rewind(m, true);
(void) sd_bus_message_read_basic(m, 's', &interface);
(void) sd_bus_message_read_basic(m, 's', &property);
r = sd_bus_reply_method_errorf(
m,
SD_BUS_ERROR_UNKNOWN_PROPERTY,
"Unknown property or interface.");
else
"Unknown interface %s or property %s.", strnull(interface), strnull(property));
} else
r = sd_bus_reply_method_errorf(
m,
SD_BUS_ERROR_UNKNOWN_METHOD,
"Unknown method '%s' or interface '%s'.", m->member, m->interface);
"Unknown method %s or interface %s.", m->member, m->interface);
if (r < 0)
return r;