diff options
| author | 0xAX <0xAX@users.noreply.github.com> | 2016-10-12 00:30:04 +0300 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-11 17:30:04 -0400 |
| commit | 74e7579c17e08ee548a81dfca3d98251d3d3948c (patch) | |
| tree | b12aae5c00c0c4b1d1a7d64fac55fdcc2785d639 /src/core | |
| parent | 8492849ee567c4657d6ac6587ed9536857624b4c (diff) | |
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.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/main.c b/src/core/main.c index 4b82a57b3c..61f3828a36 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(); |