diff options
| author | Ed Santiago <santiago@redhat.com> | 2019-03-13 13:49:39 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2019-03-13 16:34:31 -0600 |
| commit | 8f82edbcb3f43e39e037327ad39f4e660e11f20e (patch) | |
| tree | 727378218d3726972ed232d3c5ffed03eb543cf5 /cmd/podman/common.go | |
| parent | 7426d4fbbeaf5ebd3d55576add89b99cd3f3f760 (diff) | |
| download | podman-8f82edbcb3f43e39e037327ad39f4e660e11f20e.tar.gz podman-8f82edbcb3f43e39e037327ad39f4e660e11f20e.tar.bz2 podman-8f82edbcb3f43e39e037327ad39f4e660e11f20e.zip | |
Usage messages: deduplicate '(default true)' et al
Remove hardcoded '(default: true)' strings from bool flags,
and '(default this-or-that)' from string flags.
First because it's unmaintainable duplication that would cause
confusion should someone ever change the default and not notice
the message.
Second, because cobra[1] already prints '(default XXXX)' for
all options with non-false non-nil default. So in each of
these cases, current podman help behavior is:
$ podman login --help
...
--tls-verify Require HTTPS ... (default: true) (default true)
This PR eliminates that duplication.
[1] actually spf13/pflag/flag.go
The only nontrivial one of these is start.go, where the default
for sigProxy depends on the --attach flag. Solution: change
the command-line default to false, and implement the new
conditional default in logic. Bonus: removed unnecessary
check, because now if sigProxy is set without --attach,
we can guarantee that it was done by the user. But please
pay close scrutiny to this particular section in case
there's something I missed.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 79b7495ab..1d96f40c8 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -313,7 +313,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { ) createFlags.String( "image-volume", "bind", - "Tells podman how to handle the builtin image volumes. The options are: 'bind', 'tmpfs', or 'ignore' (default 'bind')", + "Tells podman how to handle the builtin image volumes. The options are: 'bind', 'tmpfs', or 'ignore'", ) createFlags.Bool( "init", false, @@ -374,7 +374,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { ) createFlags.Int64( "memory-swappiness", -1, - "Tune container memory swappiness (0 to 100) (default -1)", + "Tune container memory swappiness (0 to 100, or -1 for system default)", ) createFlags.String( "name", "", |