From 6fb0a706af438778dd372d4b05b417fb30a45965 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 15 Apr 2019 09:53:38 -0500 Subject: Fix segfaults attribute to missing options In cases where the remote client culls options to a command, we need to be sure that the lookup for that flag does not result in a nil pointer. To do so, we add a Remote attribute to the podman struct and then cli helper funcs are now aware they are remote. Signed-off-by: baude --- cmd/podman/pull.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/podman/pull.go') diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index 7cc7b65b3..04eb5bd46 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -32,6 +32,7 @@ var ( RunE: func(cmd *cobra.Command, args []string) error { pullCommand.InputArgs = args pullCommand.GlobalFlags = MainGlobalOpts + pullCommand.Remote = remoteclient return pullCmd(&pullCommand) }, Example: `podman pull imageName @@ -117,7 +118,7 @@ func pullCmd(c *cliconfig.PullValues) (retError error) { DockerRegistryCreds: registryCreds, DockerCertPath: c.CertDir, } - if c.Flag("tls-verify").Changed { + if c.IsSet("tls-verify") { dockerRegistryOptions.DockerInsecureSkipTLSVerify = types.NewOptionalBool(!c.TlsVerify) } -- cgit v1.2.3-54-g00ecf