diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-28 18:45:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 18:45:18 -0500 |
| commit | cff448be2d10283e956fada480a063aa346f4a67 (patch) | |
| tree | 0df5b67905dbb2cfc440fb8ae880b70687cba24c /cmd | |
| parent | 49d511b6ee88ceff70cc6786c467bed39da35a61 (diff) | |
| parent | ca980c2e024bd33f4be3a33bb1dbb22c86bfe072 (diff) | |
| download | podman-cff448be2d10283e956fada480a063aa346f4a67.tar.gz podman-cff448be2d10283e956fada480a063aa346f4a67.tar.bz2 podman-cff448be2d10283e956fada480a063aa346f4a67.zip | |
Merge pull request #13357 from Romain-Geissler-1A/backport-connection-implies-remote
Option --url and --connection should imply --remote.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/registry/remote.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index f05d8f7b4..181ef6b4a 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -30,6 +30,12 @@ func IsRemote() bool { fs.Usage = func() {} fs.SetInterspersed(false) fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "") + connectionFlagName := "connection" + ignoredConnection := "" + fs.StringVarP(&ignoredConnection, connectionFlagName, "c", "", "") + urlFlagName := "url" + ignoredURL := "" + fs.StringVar(&ignoredURL, urlFlagName, "", "") // The shell completion logic will call a command called "__complete" or "__completeNoDesc" // This command will always be the second argument @@ -39,6 +45,8 @@ func IsRemote() bool { start = 2 } _ = fs.Parse(os.Args[start:]) + // --connection or --url implies --remote + remoteFromCLI.Value = remoteFromCLI.Value || fs.Changed(connectionFlagName) || fs.Changed(urlFlagName) }) return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value } |