opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 12:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove help/usage from --remote pre-check

Browse Source 
--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>
This commit is contained in:
Jhon Honce
2020-08-18 08:57:00 -07:00
parent 748e8829da
commit 3c1c55c8ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/registry/remote.go
View File

@ -15,13 +15,14 @@ var remoteFromCLI = struct {
}{} }{}
// IsRemote returns true if podman was built to run remote or --remote flag given on CLI // 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 { func IsRemote() bool {
remoteFromCLI.sync.Do(func() { remoteFromCLI.sync.Do(func() {
fs := pflag.NewFlagSet("remote", pflag.ContinueOnError) fs := pflag.NewFlagSet("remote", pflag.ContinueOnError)
fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", false, "")
fs.ParseErrorsWhitelist.UnknownFlags = true fs.ParseErrorsWhitelist.UnknownFlags = true
fs.Usage = func() {}
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", false, "")
_ = fs.Parse(os.Args[1:]) _ = fs.Parse(os.Args[1:])
}) })
return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value