summaryrefslogtreecommitdiff
path: root/cmd/podman/load.go
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2019-03-13 13:49:39 -0600
committerEd Santiago <santiago@redhat.com>2019-03-13 16:34:31 -0600
commit8f82edbcb3f43e39e037327ad39f4e660e11f20e (patch)
tree727378218d3726972ed232d3c5ffed03eb543cf5 /cmd/podman/load.go
parent7426d4fbbeaf5ebd3d55576add89b99cd3f3f760 (diff)
downloadpodman-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/load.go')
-rw-r--r--cmd/podman/load.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/load.go b/cmd/podman/load.go
index 303c23bc7..aedbdd8ac 100644
--- a/cmd/podman/load.go
+++ b/cmd/podman/load.go
@@ -34,7 +34,7 @@ func init() {
loadCommand.SetHelpTemplate(HelpTemplate())
loadCommand.SetUsageTemplate(UsageTemplate())
flags := loadCommand.Flags()
- flags.StringVarP(&loadCommand.Input, "input", "i", "/dev/stdin", "Read from archive file, default is STDIN")
+ flags.StringVarP(&loadCommand.Input, "input", "i", "/dev/stdin", "Read from archive file instead of from terminal")
flags.BoolVarP(&loadCommand.Quiet, "quiet", "q", false, "Suppress the output")
flags.StringVar(&loadCommand.SignaturePolicy, "signature-policy", "", "Pathname of signature policy file (not usually used)")