systemctl: hide legends with --quiet, allow overriding #18596
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks nice! |
yuwata
added
the
good-to-merge/waiting-for-ci 👍
bluca
approved these changes
Feb 15, 2021
poettering
requested changes
Feb 15, 2021
|
BTW, it is welcome if shell completions for systemctl are updated. |
keszybz
removed
the
good-to-merge/waiting-for-ci 👍
|
Updated.
|
keszybz
force-pushed
the
systemctl-quiet-legend
branch
from
b9eae70
to
551145f
Compare
poettering
requested changes
Feb 15, 2021
poettering
added
the
reviewed/needs-rework 🔨
keszybz
force-pushed
the
systemctl-quiet-legend
branch
from
551145f
to
995d88c
Compare
keszybz
removed
the
reviewed/needs-rework 🔨
keszybz
added
good-to-merge/waiting-for-ci 👍
keszybz
force-pushed
the
systemctl-quiet-legend
branch
from
995d88c
to
7b8bcb4
Compare
poettering
reviewed
Feb 17, 2021
| } else | ||
| arg_man = true; | ||
|
|
||
| r = parse_boolean_argument("--man", optarg, &arg_man); |
There was a problem hiding this comment.
hmm, first argument should probably be suffixed with "=", it's a switch that expects an argument after all, and the old error message did suffix it like that.
i.e. we usually have this rule to suffix cmdline switches and config settings that take an argument with "=", to indicate that.
There was a problem hiding this comment.
You're right. I added this now in the places where the arg is required (but not where not).
poettering
added
good-to-merge/with-minor-suggestions
and removed
good-to-merge/waiting-for-ci 👍
This nicely covers the case when optarg is optional. The same parser can be used when the option string passed to getopt_long() requires a parameter and when it doesn't. The error messages are made consistent. Also fixes a log error c&p in --crash-reboot message.
…n type This still works nicely, but we need to assign the return value ourselves. As before, one nice effect is that error messages are uniform.
…usion We were passing a reference to 'int arg_seal' to config_parse_bool(), which expects a 'bool *'. Luckily, this would work, because 'bool' is smaller than 'int', so config_parse_bool() would set the least-significant byte of arg_seal. At least I think so. But let's use consistent types ;) Also, modernize style a bit and don't use integers in boolean context.
--no-legend is replaced by --legend=no. --quiet now implies --legend=no, but --legend=yes may be used to override that. --quiet controls hints and warnings and such, and --legend controls just the legends. I think it makes sense to allow both to controlled independently, in particular --quiet --legend makes sense when using systemctl in a script to provide some user-visible output. Fixes systemd#18560.
I don't think it makes sense to complete --legend=yes. It is the default, and it would be only used very rarely (and then it is easy enough to just remove the '=no' part from the suggested string).
keszybz
force-pushed
the
systemctl-quiet-legend
branch
from
7b8bcb4
to
d60bd2f
Compare
keszybz
added
good-to-merge/waiting-for-ci 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes --quiet imply --no-legend, but allows --legend to be used to
override that. --quiet controls hints and warnings and such, and --legend controls
just the legends. I think it makes sense to allow both to controlled independently,
in particular --quiet --legend makes sense when using systemctl in a script to
provide some user-visible output.
Fixes #18560.
I think we would want to provide the same interface in other tools. I'll
convert them if there's agreement on the approach.