diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-08-18 08:57:00 -0700 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2020-08-30 15:39:01 +0200 |
| commit | b64d29bdf2d6aa9fe402ab2b54cc888fe1e4eb62 (patch) | |
| tree | 31e947a4fa4fc9561b9d367852ec99cdf95a8886 | |
| parent | 8b38d27ebdc825c1336d898d1a21fd8f301b18b0 (diff) | |
| download | podman-b64d29bdf2d6aa9fe402ab2b54cc888fe1e4eb62.tar.gz podman-b64d29bdf2d6aa9fe402ab2b54cc888fe1e4eb62.tar.bz2 podman-b64d29bdf2d6aa9fe402ab2b54cc888fe1e4eb62.zip | |
Remove help/usage from --remote pre-check
--remote pre-check was providing usage context, which was also being
provided by the root podman command.
Fixes #7273
Signed-off-by: Jhon Honce <jhonce@redhat.com>
| -rw-r--r-- | cmd/podman/registry/remote.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 57427f372..217652ec0 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -15,13 +15,14 @@ var remoteFromCLI = struct { }{} // IsRemote returns true if podman was built to run remote or --remote flag given on CLI -// Use in init() functions as a initialization check +// Use in init() functions as an initialization check func IsRemote() bool { remoteFromCLI.sync.Do(func() { fs := pflag.NewFlagSet("remote", pflag.ContinueOnError) - fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", false, "") fs.ParseErrorsWhitelist.UnknownFlags = true + fs.Usage = func() {} fs.SetInterspersed(false) + fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", false, "") _ = fs.Parse(os.Args[1:]) }) return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value |