From: 0xAX <0xAX@users.noreply.github.com>
Date: Tue, 11 Oct 2016 21:30:04 +0000 (+0300)
Subject: core/main: get rid from excess check of ACTION_TEST (#4350)
X-Git-Tag: v232~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74e7579c17e08ee548a81dfca3d98251d3d3948c;p=thirdparty%2Fsystemd.git

core/main: get rid from excess check of ACTION_TEST (#4350)

If `--test` command line option was passed, the systemd set skip_setup
to true during bootup. But after this we check again that arg_action is
test or help and opens pager depends on result.

We should skip setup in a case when `--test` is passed, but it is also
safe to set skip_setup in a case of `--help`. So let's remove first
check and move skip_setup = true to the second check.
---

diff --git a/src/core/main.c b/src/core/main.c
index 4b82a57b3c8..61f3828a369 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1614,11 +1614,10 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if (arg_action == ACTION_TEST)
-                skip_setup = true;
-
-        if (arg_action == ACTION_TEST || arg_action == ACTION_HELP)
+        if (arg_action == ACTION_TEST || arg_action == ACTION_HELP) {
                 pager_open(arg_no_pager, false);
+                skip_setup = true;
+        }
 
         if (arg_action == ACTION_HELP) {
                 retval = help();