diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-15 06:22:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 06:22:46 -0700 |
| commit | ccf991f530dbe41d86b904ec900fda01ae3e1474 (patch) | |
| tree | b1ae19c5cebdefbcedd5532108e30680cc687aad /cmd/podman/load.go | |
| parent | 37dcc0a305a1606de7c0f5521d11250a4318bb51 (diff) | |
| parent | 1e124306dbd35a4cfdf3f585119a2c4441ec543d (diff) | |
| download | podman-ccf991f530dbe41d86b904ec900fda01ae3e1474.tar.gz podman-ccf991f530dbe41d86b904ec900fda01ae3e1474.tar.bz2 podman-ccf991f530dbe41d86b904ec900fda01ae3e1474.zip | |
Merge pull request #2633 from edsantiago/default_default
Usage messages: deduplicate '(default true)' et al
Diffstat (limited to 'cmd/podman/load.go')
| -rw-r--r-- | cmd/podman/load.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/podman/load.go b/cmd/podman/load.go index 303c23bc7..46add699e 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", "", "Read from specified archive file (default: stdin)") flags.BoolVarP(&loadCommand.Quiet, "quiet", "q", false, "Suppress the output") flags.StringVar(&loadCommand.SignaturePolicy, "signature-policy", "", "Pathname of signature policy file (not usually used)") @@ -64,7 +64,10 @@ func loadCmd(c *cliconfig.LoadValues) error { if runtime.Remote && len(input) == 0 { return errors.New("the remote client requires you to load via -i and a tarball") } - if input == "/dev/stdin" { + if len(input) == 0 { + input = "/dev/stdin" + c.Input = input + fi, err := os.Stdin.Stat() if err != nil { return err |