summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-11-09 19:40:46 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-11-09 19:41:00 -0500
commit0a9776c23010512b9096508ff795d12da0f8fc2d (patch)
tree72cf2cb1f8dfdf69af1c5d42556230a65221466b
parent7c99d940c11e4da1863a218b6b70dd16e65b7518 (diff)
systemctl: make sure daemon-reload returns success
Also change sd_bus_message_exit_container to return -ENOENT when not in a container, to make it easier to distinguish different errors.
-rw-r--r--src/libsystemd-bus/bus-message.c2
-rw-r--r--src/systemctl/systemctl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index 2c2e69e393..411156a12a 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -3018,7 +3018,7 @@ _public_ int sd_bus_message_exit_container(sd_bus_message *m) {
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
- assert_return(m->n_containers > 0, -EINVAL);
+ assert_return(m->n_containers > 0, -ENOENT);
c = message_get_container(m);
if (c->enclosing == SD_BUS_TYPE_ARRAY) {
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 24295e411b..df4bd2147c 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3762,7 +3762,7 @@ static int daemon_reload(sd_bus *bus, char **args) {
else if (r < 0)
log_error("Failed to execute operation: %s", bus_error_message(&error, r));
- return r;
+ return r < 0 ? r : 0;
}
static int reset_failed(sd_bus *bus, char **args) {