[systemd-commits] src/systemctl.c

Lennart Poettering lennart at kemper.freedesktop.org
Tue Aug 31 17:12:01 PDT 2010


 src/systemctl.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit aabd9b11ba563e1d988b119960c94b139ec5de00
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Sep 1 02:11:52 2010 +0200

    systemctl: make sure daemon-reexec and friends return a correct error code

diff --git a/src/systemctl.c b/src/systemctl.c
index 901804a..ea09c3c 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -2928,7 +2928,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) {
                 if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(&error)) {
                         /* There's always a fallback possible for
                          * legacy actions. */
-                        r = 0;
+                        r = -EADDRNOTAVAIL;
                         goto finish;
                 }
 
@@ -2937,7 +2937,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) {
                 goto finish;
         }
 
-        r = 1;
+        r = 0;
 
 finish:
         if (m)
@@ -4605,7 +4605,7 @@ static int talk_upstart(void) {
         if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
 
                 if (error_is_no_service(&error)) {
-                        r = 0;
+                        r = -EADDRNOTAVAIL;
                         goto finish;
                 }
 
@@ -4614,7 +4614,7 @@ static int talk_upstart(void) {
                 goto finish;
         }
 
-        r = 1;
+        r = 0;
 
 finish:
         if (m)


More information about the systemd-commits mailing list