From cc4a70c806a74b3bf4acfd2983a61b2ef74bd6f9 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Tue, 1 Mar 2022 13:15:03 -0600 Subject: Revert "Option --url and --connection should imply --remote." This reverts commit ca980c2e024bd33f4be3a33bb1dbb22c86bfe072. Signed-off-by: Brent Baude --- cmd/podman/registry/remote.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 181ef6b4a..f05d8f7b4 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -30,12 +30,6 @@ 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 @@ -45,8 +39,6 @@ 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 } -- cgit v1.2.3-54-g00ecf