opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5762 from baude/v2versionformat

Browse Source 
podmanv2 version format variable name change
This commit is contained in:
OpenShift Merge Robot
2020-04-13 22:44:17 +02:00
committed by GitHub
parent 0b067b67e6 11fa4b6eba
commit 5cf64aee11
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podmanV2/system/version.go
View File

@ -24,7 +24,7 @@ var (
RunE: version, RunE: version,
PersistentPreRunE: preRunE, PersistentPreRunE: preRunE,
} }
format string versionFormat string
) )
type versionStruct struct { type versionStruct struct {
@ -38,7 +38,7 @@ func init() {
Command: versionCommand, Command: versionCommand,
}) })
flags := versionCommand.Flags() flags := versionCommand.Flags()
flags.StringVarP(&format, "format", "f", "", "Change the output format to JSON or a Go template") flags.StringVarP(&versionFormat, "format", "f", "", "Change the output format to JSON or a Go template")
} }
func version(cmd *cobra.Command, args []string) error { func version(cmd *cobra.Command, args []string) error {
@ -62,7 +62,7 @@ func version(cmd *cobra.Command, args []string) error {
v.Server = v.Client v.Server = v.Client
//} //}
versionOutputFormat := format versionOutputFormat := versionFormat
if versionOutputFormat != "" { if versionOutputFormat != "" {
if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" { if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" {
versionOutputFormat = formats.JSONString versionOutputFormat = formats.JSONString