From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 25 Jan 2016 14:21:28 +0000 (+0100)
Subject: systemctl: is-active/failed should return 0 if at least one unit is in given state
X-Git-Tag: v229~92^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d60f6ad0cb690d920b8acbfb545bad29554609f1;p=thirdparty%2Fsystemd.git

systemctl: is-active/failed should return 0 if at least one unit is in given state

Previously we have return the not-found code, in the case that we found a
unit which does not belong to set active (resp. failed), which is the
opposite than what is written in man page.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 0199f28eba5..94c99c4d91f 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3153,6 +3153,7 @@ static int check_unit_generic(int code, const char *good_states, char **args) {
         sd_bus *bus;
         char **name;
         int r;
+        bool found = false;
 
         r = acquire_bus(BUS_MANAGER, &bus);
         if (r < 0)
@@ -3168,11 +3169,13 @@ static int check_unit_generic(int code, const char *good_states, char **args) {
                 state = check_one_unit(bus, *name, good_states, arg_quiet);
                 if (state < 0)
                         return state;
-                if (state == 0)
-                        r = code;
+                if (state > 0)
+                        found = true;
         }
 
-        return r;
+        /* use the given return code for the case that we won't find
+         * any unit which matches the list */
+        return found ? 0 : code;
 }
 
 static int check_unit_active(int argc, char *argv[], void *userdata) {